[climacs-devel] Fwd: Insert file

Christophe Rhodes csr21 at cam.ac.uk
Thu May 19 09:02:30 UTC 2005


David Lewis <d.lewis at gold.ac.uk> writes:

> I've had to implement an insert-file command for my own work (helped
> by  Christophe). Hope it's useful.

OK, no-one seems to have complained too much about this, so I've
merged it into Climacs CVS.

> Change to gui.lisp:
>
> @@ -707,6 +710,20 @@

For future reference: it's significantly easier to merge patches if
they come straight from the diff command (or cvs diff), because they
can just be fed into another program.  cvs diff produces a header like

Index: gui.lisp
===================================================================
RCS file: /project/climacs/cvsroot/climacs/gui.lisp,v
retrieving revision 1.138
diff -u -r1.138 gui.lisp
--- gui.lisp    10 May 2005 16:28:53 -0000      1.138
+++ gui.lisp    19 May 2005 09:04:08 -0000

before the diff itself, which allows the patch program to identify
"hunks" and apply the patch automatically.

Nevertheless, thank you for your contribution.

Cheers,

Christophe



More information about the climacs-devel mailing list