robin@gradient.gradient.com (Dr R.P. Alston) (04/05/91)
Archive-name: text/diff/emerge/1991-04-03 Archive: tut.cis.ohio-state.edu:/pub/gnu/emacs/elisp-archive/as-is/emerge.el.Z [128.146.8.60] Original-posting-by: robin@gradient.gradient.com (Dr R.P. Alston) Original-subject: diff'ing with GNU emacs [summary] Reposted-by: emv@msen.com (Edward Vielmetti, MSEN) Thankyou everyone for the response on my request. I ended up with a number of solutions: 1) Compare-windows (seems to be part of distribution), unfortunately not really what I wanted, this needs a fair amount of manual keying to perform the updates I am doing. 2) emerge. Written by Dale R Worley (drw@math.mit.edu). This is the package I ended up using. It allows you to work on two files or buffers and with very few keystrokes update a 'final' image with the correct diffs. Generates a very nice 3 window screen showing you the 2 files and the final version. This is apparently available thru ftp (although the provider of this snippet indicated it may be an older version): tut.cis.ohio-state.edu pub/gnu/emacs/elisp-archive/as-is:\ 13627 Jun 21 1990 emerge.el.Z 3) A package from richard stallman which allows you to do diffs more than compare-windows does. Unfortunately the version of emacs I have appears to be missing some of the functions used so I could not use it (sorry richard). And then significant a number of other peoples individual packages that do their own things using diff. Thankyou all for your replies. I'm afraid I just didn't have the time to use/test them all, but after receiving a number of people all recommending 2) I went that route. robin