cd c:\Hacking\cvs.xemacs.org\XEmacs\packages\xemacs-packages\sh-script\
patch --dry-run --verbose < jerome-sh-script-2005-10-12.patch
Compilation started at Sat Oct 15 15:31:23 2005 +0200 (W. Europe Daylight Time)
Hmm...  Looks like a unified diff to me...
(Stripping trailing CRs from patch.)
The text leading up to this was:
--------------------------
|X-From-Line: jmarant@free.fr  Wed Oct 12 23:38:27 2005
|Return-Path: <xemacs-patches-bounces@xemacs.org>
|Received: from mailin12.aul.t-online.de (mailin12.bbul.t-online.de [172.18.16.26])
|	by imss03 (Cyrus v3.0.8.6) with LMTP; Thu, 13 Oct 2005 00:01:07 +0200
|X-Sieve: CMU Sieve 2.2
|Received: from gwyn.tux.org ([199.184.165.135]) by mailin12.sul.t-online.de
|	with esmtp id 1EPoeg-0AVhuS0; Thu, 13 Oct 2005 00:00:58 +0200
|Received: from gwyn.tux.org (ident-user@localhost.localdomain [127.0.0.1])
|	by gwyn.tux.org (8.12.11/8.12.11) with ESMTP id j9CLxwB4029999;
|	Wed, 12 Oct 2005 17:59:59 -0400
|Received: from gwyn.tux.org (ident-user@localhost.localdomain [127.0.0.1])
|	by gwyn.tux.org (8.12.11/8.12.11) with ESMTP id j9CLxshg029988
|	for <xemacs-patches-mailman@xemacs.org>; Wed, 12 Oct 2005 17:59:54 -0400
|Received: (from xemacweb@localhost)
|	by gwyn.tux.org (8.12.11/8.12.11/Submit) id j9CLxsjR029987
|	for xemacs-patches-mailman@xemacs.org; Wed, 12 Oct 2005 17:59:54 -0400
|Received: from gwyn.tux.org (ident-user@localhost.localdomain [127.0.0.1])
|	by gwyn.tux.org (8.12.11/8.12.11) with ESMTP id j9CLxrPO029975
|	for <xemacweb@tux.org>; Wed, 12 Oct 2005 17:59:53 -0400
|Received: (from mailnull@localhost)
|	by gwyn.tux.org (8.12.11/8.12.11/Submit) id j9CLxrwI029974
|	for xemacweb@tux.org; Wed, 12 Oct 2005 17:59:53 -0400
|Received: from yxa.extundo.com (root@178.230.13.217.in-addr.dgcsystems.net
|	[217.13.230.178])
|	by gwyn.tux.org (8.12.11/8.12.11) with ESMTP id j9CLxYcQ029874
|	for <xemacs-patches@xemacs.org>; Wed, 12 Oct 2005 17:59:51 -0400
|Received: from smtp4-g19.free.fr (smtp4-g19.free.fr [212.27.42.30])
|	by yxa.extundo.com (8.13.4/8.13.4/Debian-3) with ESMTP id
|	j9CLe4HZ006230
|	for <xemacs-patches@xemacs.org>; Wed, 12 Oct 2005 23:40:04 +0200
|Received: from amboise (mol92-4-82-227-97-206.fbx.proxad.net [82.227.97.206])
|	by smtp4-g19.free.fr (Postfix) with ESMTP id 416A74027E
|	for <xemacs-patches@xemacs.org>; Wed, 12 Oct 2005 23:39:00 +0200 (CEST)
|Received: by amboise (Postfix, from userid 1000)
|	id 0C93F2C03F; Wed, 12 Oct 2005 23:38:28 +0200 (CEST)
|From: =?iso-8859-1?Q?J=E9r=F4me_Marant?= <jmarant@free.fr>
|To: xemacs-patches@xemacs.org
|X-Generated-By: Patcher version 3.7
|Date: Wed, 12 Oct 2005 23:38:27 +0200
|X-Gnus-Mail-Source: pop:Adrian.Aichner@popmail.t-online.de
|Message-ID: <87d5mao1po.fsf@marant.org>
|MIME-Version: 1.0
|Content-Type: text/plain; charset=iso-8859-1
|Content-Transfer-Encoding: 8bit
|X-Spam-Status: No, score=0.0 required=5.0 tests=none autolearn=failed 
|	version=3.0.3
|X-Spam-Checker-Version: SpamAssassin 3.0.3 (2005-04-27) on yxa-iv
|X-Virus-Scanned: ClamAV version 0.83, clamav-milter version 0.83 on gwyn.tux.org
|X-Virus-Scanned: ClamAV version 0.83,
|	clamav-milter version 0.83 on gwyn.tux.org
|X-Virus-Scanned: ClamAV version 0.83,
|	clamav-milter version 0.83 on gwyn.tux.org
|X-Virus-Scanned: ClamAV version 0.83,
|	clamav-milter version 0.83 on gwyn.tux.org
|X-Virus-Scanned: ClamAV version 0.84,
|	clamav-milter version 0.84e on yxa.extundo.com
|X-Virus-Status: Clean
|X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-1.6 (gwyn.tux.org [0.0.0.0]); Wed, 12 Oct 2005 18:00:03 -0400 (EDT)
|X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-1.6
|	(gwyn.tux.org [0.0.0.0]); Wed, 12 Oct 2005 17:59:54 -0400 (EDT)
|X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-1.6
|	(gwyn.tux.org [0.0.0.0]); Wed, 12 Oct 2005 17:59:54 -0400 (EDT)
|X-Greylist: Delayed for 00:19:42 by milter-greylist-1.6 (gwyn.tux.org
|	[199.184.165.136]); Wed, 12 Oct 2005 17:59:53 -0400 (EDT)
|X-XEmacs-List: patches
|Subject: [PATCH] Sync sh-script.el with GNU Emacs 21.4 (3)
|X-BeenThere: xemacs-patches@xemacs.org
|X-Mailman-Version: 2.1.5
|Precedence: list
|List-Id: XEmacs Patch Submissions <xemacs-patches.xemacs.org>
|List-Unsubscribe: <http://lists.xemacs.org/lists/listinfo/xemacs-patches>,
|	<mailto:xemacs-patches-request@xemacs.org?subject=unsubscribe>
|List-Post: <mailto:xemacs-patches@xemacs.org>
|List-Help: <mailto:xemacs-patches-request@xemacs.org?subject=help>
|List-Subscribe: <http://lists.xemacs.org/lists/listinfo/xemacs-patches>,
|	<mailto:xemacs-patches-request@xemacs.org?subject=subscribe>
|Sender: xemacs-patches-bounces@xemacs.org
|Errors-To: xemacs-patches-bounces@xemacs.org
|X-TOI-SPAM: n;1;2005-10-12T22:01:07Z
|X-TOI-VIRUSSCAN: unchecked
|X-TOI-EXPURGATEID: 149288::051013000107-048302A0-19F0CACD
|X-TOI-SPAMCLASS: Clean, Normal
|X-TOI-MSGID: 8846acb4-ffa4-4e03-8e71-f2f9c00f67ab
|X-Seen: false
|X-Content-Length: 95837
|Lines: 2933
|Xref: TANG xemacs-patches:12044
|
|Hi,
|
|Here is the final (I hope :-) version of the patch. I added changelog
|comments for Malcolm additions. Feel free to improve them :-)
|
|Cheers,
|
|
|ChangeLog addition:
|
|2005-10-12  Jérôme Marant  <jmarant@free.fr>
|
|	* sh-script.el: Sync with GNU Emacs 21.4
|        Update FSF's address in GPL notices.
|	(sh-mode-map): Move menu-related code to sh-mode-menu.
|	(sh-mode-menu): New menu definition.
|	(sh-mode): Install menu.
|
|
|XEmacs packages sh-script source patch:
|Diff command:   cvs -q diff -u
|Files affected: sh-script.el
|
|Index: sh-script.el
|===================================================================
|RCS file: /pack/xemacscvs/XEmacs/packages/xemacs-packages/sh-script/sh-script.el,v
|retrieving revision 1.8
|diff -u -r1.8 sh-script.el
|--- sh-script.el	2003/01/06 18:31:31	1.8
|+++ sh-script.el	2005/10/12 21:30:16
--------------------------
Patching file sh-script.el using Plan A...
Hunk #1 succeeded at 1.
Hunk #2 succeeded at 22.
Hunk #3 FAILED at 41.
Hunk #4 succeeded at 265.
Hunk #5 succeeded at 289.
Hunk #6 succeeded at 303.
Hunk #7 FAILED at 366.
Hunk #8 succeeded at 397.
Hunk #9 succeeded at 438.
Hunk #10 succeeded at 470.
Hunk #11 succeeded at 487.
Hunk #12 succeeded at 503.
Hunk #13 succeeded at 575.
Hunk #14 succeeded at 600.
Hunk #15 succeeded at 631.
Hunk #16 succeeded at 761.
Hunk #17 succeeded at 806.
Hunk #18 succeeded at 861.
Hunk #19 succeeded at 1233.
Hunk #20 succeeded at 1260.
Hunk #21 succeeded at 1286.
Hunk #22 succeeded at 1305.
Hunk #23 succeeded at 1315.
Hunk #24 succeeded at 1342.
Hunk #25 succeeded at 1389.
Hunk #26 succeeded at 1400.
Hunk #27 succeeded at 1477.
Hunk #28 succeeded at 1597.
Hunk #29 succeeded at 1613.
Hunk #30 succeeded at 1621.
Hunk #31 succeeded at 1675.
Hunk #32 succeeded at 1684.
Hunk #33 succeeded at 3121.
Hunk #34 succeeded at 3179.
Hunk #35 succeeded at 3285.
Hunk #36 succeeded at 3306.
Hunk #37 succeeded at 3358.
Hunk #38 succeeded at 3378.
Hunk #39 succeeded at 3402.
Hunk #40 succeeded at 3412.
Hunk #41 succeeded at 3469.
Hunk #42 succeeded at 3478.
Hunk #43 succeeded at 3514.
Hunk #44 succeeded at 3562.
2 out of 44 hunks FAILED -- saving rejects to file sh-script.el.rej
Hmm...  Ignoring the trailing garbage.
done

Compilation exited abnormally with code 1 at Sat Oct 15 15:31:23