Mercurial > hg > xemacs-beta
comparison lisp/ediff/README @ 0:376386a54a3c r19-14
Import from CVS: tag r19-14
| author | cvs |
|---|---|
| date | Mon, 13 Aug 2007 08:45:50 +0200 |
| parents | |
| children | bcdc7deadc19 |
comparison
equal
deleted
inserted
replaced
| -1:000000000000 | 0:376386a54a3c |
|---|---|
| 1 **** EDIFF -- a comprehensive interface to diff for Emacs 19 and XEmacs 19 | |
| 2 | |
| 3 **** This version of Ediff requires *at least* Emacs 19.30 or XEmacs 19.14 | |
| 4 | |
| 5 This directory: | |
| 6 | |
| 7 README -- This file | |
| 8 Makefile -- Automated installation file | |
| 9 ediff.texi -- Manual in Texinfo format | |
| 10 ediff.info* -- The Info files | |
| 11 ediff.dvi -- Manual in DVI format | |
| 12 | |
| 13 ediff.el -- Ediff Emacs Lisp code | |
| 14 ediff-init.el -- Ediff Emacs Lisp code | |
| 15 ediff-wind.el -- Ediff Emacs Lisp code | |
| 16 ediff-util.el -- Ediff Emacs Lisp code | |
| 17 ediff-diff.el -- Ediff Emacs Lisp code | |
| 18 ediff-merg.el -- Ediff Emacs Lisp code | |
| 19 ediff-mult.el -- Ediff Emacs Lisp code | |
| 20 ediff-vers.el -- Ediff Emacs Lisp code | |
| 21 ediff-ptch.el -- Ediff Emacs Lisp code | |
| 22 ediff-hook.el -- Ediff Emacs Lisp code | |
| 23 | |
| 24 | |
| 25 To install Ediff do: | |
| 26 | |
| 27 uncompress ediff.tar.Z | |
| 28 tar xf ediff.tar | |
| 29 | |
| 30 | |
| 31 Then do the following: | |
| 32 | |
| 33 1. To compile Lisp: | |
| 34 | |
| 35 make (or 'make all') | |
| 36 | |
| 37 2. You can also type | |
| 38 | |
| 39 make install | |
| 40 | |
| 41 to do what "make all" does plus it will copy the files ediff*.elc | |
| 42 into a suitable Lisp directory. | |
| 43 | |
| 44 To make this happen, you will most likely have to change the PREFIX | |
| 45 variable in Makefile and, possibly, one or more of these variables: | |
| 46 | |
| 47 DATADIR, LISPDIR, INFODIR, ETCDIR, and VERSION | |
| 48 | |
| 49 if they don't point to the right directories in your installation. | |
| 50 You also need to have a write permission for all directories | |
| 51 mentioned in LISPDIR, INFODIR, and ETCDIR. | |
| 52 | |
| 53 3. XEmacs users must invoke `make' with the parameter EMACS=xemacs | |
| 54 or whatever name is used to invoke XEmacs (some sites still use xemacs | |
| 55 for Emacs 18). An even better thing would be to edit Makefile directly | |
| 56 as indicated in the comments there. | |
| 57 | |
| 58 For manual installation, copy ediff*.elc into a directory on your load-path. | |
| 59 | |
| 60 For more details, read documentation at the beginning of the file ediff.el | |
| 61 | |
| 62 To install on-line documentation, you need to install the Info files | |
| 63 by copying | |
| 64 | |
| 65 ediff.info* | |
| 66 | |
| 67 into your Info directory (which is emacs-root-dir/info, | |
| 68 if emacs-root-dir is the root directory of the installation). | |
| 69 | |
| 70 Then edit the file | |
| 71 | |
| 72 emacs-root-dir/info/dir | |
| 73 | |
| 74 to include the root menu item for Ediff (check how other menu | |
| 75 items look like in this file). | |
| 76 | |
| 77 In Emacs, this item should look like this: | |
| 78 | |
| 79 * Ediff: (ediff.info). A Visual Interface to Unix Diff and Patch Utilities | |
| 80 | |
| 81 In XEmacs, it looks like: | |
| 82 | |
| 83 * Ediff:: A Visual Interface to Unix Diff and Patch Utilities | |
| 84 | |
| 85 | |
| 86 Normally, all Ediff menus and autoloads are already defined in Emacs, so u | |
| 87 don't need to define anything in your .emacs to run Ediff. | |
| 88 However, if it was announced that this distribution of Ediff contains | |
| 89 new features, you may have to put | |
| 90 | |
| 91 (require 'ediff-hook) | |
| 92 | |
| 93 in your .emacs to take advantage of these new features. This doesn't load | |
| 94 Ediff, but readies it for any taks u assign to it. When this version of | |
| 95 Ediff gets installed in the standard Emacs distribution, you may remove | |
| 96 the above require-statement (but leaving it in does no harm). |