From xemacs-m  Mon Apr 21 16:34:44 1997
Received: from altair.xemacs.org (steve@xemacs.miranova.com [206.190.83.19])
	by xemacs.org (8.8.5/8.8.5) with ESMTP id QAA00207
	for <xemacs-beta@xemacs.org>; Mon, 21 Apr 1997 16:34:43 -0500 (CDT)
Received: (from steve@localhost)
	by altair.xemacs.org (8.8.5/8.8.5) id OAA30639;
	Mon, 21 Apr 1997 14:47:51 -0700
Mail-Copies-To: never
To: xemacs-beta@xemacs.org
Subject: A mini-HOWTO on creating patches (was Re: Patch for Lucid Menu Widget)
References: <199704212056.OAA10815@beethoven.cs.colostate.edu>
X-Url: http://www.miranova.com/%7Esteve/
X-Face: #!T9!#9s-3o8)*uHlX{Ug[xW7E7Wr!*L46-OxqMu\xz23v|R9q}lH?cRS{rCNe^'[`^sr5"
 f8*@r4ipO6Jl!:Ccq<xoV[Qz2u8<8-+Vwf2gzJ44lf_/y9OaQ`@#Q65{U4/TC)i2`~/M&QI$X>p:9I
 OSS'2{-)-4wBnVeg0S\O4Al@)uC[pD|+
X-Attribution: sb
From: Steven L Baur <steve@miranova.com>
In-Reply-To: michael ginis's message of Mon, 21 Apr 1997 14:56:31 -0600 (MDT)
Mime-Version: 1.0 (generated by tm-edit 7.106)
Content-Type: text/plain; charset=US-ASCII
Date: 21 Apr 1997 14:47:45 -0700
Message-ID: <m2iv1ggi9q.fsf@altair.xemacs.org>
Lines: 53
X-Mailer: Gnus v5.4.45/XEmacs 20.2(beta2)

When making patches you should use the `-c', or preferably if your
diff supports it, `-u'.  Using ordinary diffs like this are
notoriously prone to error[1] (and this one won't in fact work, since
I've already applied a patch to this file so the line numbers probably
don't match up any more).

$ diff -u old-file.c new-file.c

-or-

$ diff -c old-file.c new-file.c

Also, it is helpful for me if you create the patch in the top level of
the XEmacs source directory:

$ diff -u lwlib/xlwmenu.c~ lwlib/xlwmenu.c

I prefer patches to be accompanied by an update (either a raw entry or
a patch) to the appropriate ChangeLog file, but it is not required.


[I've added this info to etc/BETA for future reference].

michael ginis <ginis@CS.ColoState.EDU> writes:

> patch for xlwmenu.c:

> 79c79
> <   {XmNmarginWidth, XmCMarginWidth, XmRHorizontalDimension, sizeof(Dimension),
> ---
>> {XmNmarginWidth, XmCMarginWidth, XtRDimension, sizeof(Dimension),
> 81c81
> <   {XmNmarginHeight, XmCMarginHeight, XmRVerticalDimension, sizeof(Dimension),
> ---
>> {XmNmarginHeight, XmCMarginHeight, XtRDimension, sizeof(Dimension),
> 83c83
> <   {XmNspacing, XmCSpacing, XmRHorizontalDimension,  sizeof(Dimension),
> ---
>> {XmNspacing, XmCSpacing, XtRDimension,  sizeof(Dimension),
> 87c87
> <   {XmNshadowThickness, XmCShadowThickness, XmRHorizontalDimension,
> ---
>> {XmNshadowThickness, XmCShadowThickness, XtRDimension,



Footnotes: 
[1]  Anybody else remember what a disaster the  ed scripts used in the 
first patch to NetHack 2 were?  I feel so old ... :-(

-- 
steve@miranova.com baur
Unsolicited commercial e-mail will be billed at $250/message.

