robin@gradient.gradient.com (Dr R.P. Alston) (04/02/91)
Before I go off and invent the wheel, I was wondering if some kind soul has in the past implemented some lisp code for GNU emacs allowing me to diff two source files in some reasonably interactive manner. I would be most grateful for any pointers as to where to get it. Thankyou all and any for your help. Please use e-mail, save the net. robin -- Dr Robin P. Alston, Principal Member, Technical Staff, Gradient Technologies, robin@gradient.com
Dan_Jacobson@ATT.COM (04/03/91)
>>>>> On 2 Apr 91 14:54:36 GMT, robin@gradient.gradient.com (Dr R.P. Alston) said:
Dr> Before I go off and invent the wheel, I was wondering if some kind
Dr> soul has in the past implemented some lisp code for GNU emacs allowing
Dr> me to diff two source files in some reasonably interactive manner.
compare-windows:
Compare text in current window with text in next window.
Compares the text starting at point in each window,
moving over text in each one as far as they match.
Dr> I would be most grateful for any pointers as to where to get it.
Dr> Thankyou all and any for your help. Please use e-mail, save the net.
Well, one posted response saves all those folks from sending e-mail...
but mainly the article hasn't had a summary of responses posted or
been cancelled... so... I posted.
--
Dan_Jacobson@ATT.COM Naperville IL USA +1 708 979 6364
moss@cs.umass.edu (Eliot Moss) (04/03/91)
I prefer the emerge package, which not only does the diff, but displays the two files side by side and in a third window allows you to go through and decide which version of each differing region you desire to have in a merged file. Very handy! You can get it from the author, Dale R. Worley, drw@math.mit.edu. -- J. Eliot B. Moss, Assistant Professor Department of Computer and Information Science Lederle Graduate Research Center University of Massachusetts Amherst, MA 01003 (413) 545-4206, 545-1249 (fax); Moss@cs.umass.edu
eb@lucid.com (Eric Benson) (04/04/91)
There's something called Buffer Merge written by Joe Marshall here at Lucid. I don't know if it has been distributed before. It's relatively short, about 600 lines. I've found it quite useful, although it is very slow on large buffers. I'll post it to gnu.emacs.sources.