|
0
|
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
|
|
12
|
10 ediff, ediff-? -- The Info files
|
|
0
|
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
|
|
12
|
22 ediff-tbar.el -- Ediff Emacs Lisp code -- this one only for XEmacs
|
|
0
|
23 ediff-hook.el -- Ediff Emacs Lisp code
|
|
|
24
|
|
|
25
|
|
|
26 To install Ediff do:
|
|
|
27
|
|
|
28 uncompress ediff.tar.Z
|
|
|
29 tar xf ediff.tar
|
|
|
30
|
|
|
31
|
|
|
32 Then do the following:
|
|
|
33
|
|
|
34 1. To compile Lisp:
|
|
|
35
|
|
|
36 make (or 'make all')
|
|
|
37
|
|
|
38 2. You can also type
|
|
|
39
|
|
|
40 make install
|
|
|
41
|
|
|
42 to do what "make all" does plus it will copy the files ediff*.elc
|
|
|
43 into a suitable Lisp directory.
|
|
|
44
|
|
|
45 To make this happen, you will most likely have to change the PREFIX
|
|
|
46 variable in Makefile and, possibly, one or more of these variables:
|
|
|
47
|
|
|
48 DATADIR, LISPDIR, INFODIR, ETCDIR, and VERSION
|
|
|
49
|
|
|
50 if they don't point to the right directories in your installation.
|
|
|
51 You also need to have a write permission for all directories
|
|
|
52 mentioned in LISPDIR, INFODIR, and ETCDIR.
|
|
|
53
|
|
|
54 3. XEmacs users must invoke `make' with the parameter EMACS=xemacs
|
|
|
55 or whatever name is used to invoke XEmacs (some sites still use xemacs
|
|
|
56 for Emacs 18). An even better thing would be to edit Makefile directly
|
|
|
57 as indicated in the comments there.
|
|
|
58
|
|
|
59 For manual installation, copy ediff*.elc into a directory on your load-path.
|
|
|
60
|
|
|
61 For more details, read documentation at the beginning of the file ediff.el
|
|
|
62
|
|
|
63 To install on-line documentation, you need to install the Info files
|
|
|
64 by copying
|
|
|
65
|
|
|
66 ediff.info*
|
|
|
67
|
|
|
68 into your Info directory (which is emacs-root-dir/info,
|
|
|
69 if emacs-root-dir is the root directory of the installation).
|
|
|
70
|
|
|
71 Then edit the file
|
|
|
72
|
|
|
73 emacs-root-dir/info/dir
|
|
|
74
|
|
|
75 to include the root menu item for Ediff (check how other menu
|
|
|
76 items look like in this file).
|
|
|
77
|
|
|
78 In Emacs, this item should look like this:
|
|
|
79
|
|
|
80 * Ediff: (ediff.info). A Visual Interface to Unix Diff and Patch Utilities
|
|
|
81
|
|
|
82 In XEmacs, it looks like:
|
|
|
83
|
|
|
84 * Ediff:: A Visual Interface to Unix Diff and Patch Utilities
|
|
|
85
|
|
|
86
|
|
|
87 Normally, all Ediff menus and autoloads are already defined in Emacs, so u
|
|
|
88 don't need to define anything in your .emacs to run Ediff.
|
|
|
89 However, if it was announced that this distribution of Ediff contains
|
|
|
90 new features, you may have to put
|
|
|
91
|
|
|
92 (require 'ediff-hook)
|
|
|
93
|
|
|
94 in your .emacs to take advantage of these new features. This doesn't load
|
|
|
95 Ediff, but readies it for any taks u assign to it. When this version of
|
|
|
96 Ediff gets installed in the standard Emacs distribution, you may remove
|
|
|
97 the above require-statement (but leaving it in does no harm).
|
