|
0
|
1 **** EDIFF -- a comprehensive interface to diff for Emacs 19 and XEmacs 19
|
|
|
2
|
|
82
|
3 **** This version of Ediff requires *at least* Emacs 19.34 or XEmacs 19.14
|
|
0
|
4
|
|
|
5 This directory:
|
|
|
6
|
|
|
7 README -- This file
|
|
|
8 Makefile -- Automated installation file
|
|
|
9 ediff.texi -- Manual in Texinfo format
|
|
78
|
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
|
|
80
|
15 ediff-help.el -- Ediff Emacs Lisp code
|
|
0
|
16 ediff-wind.el -- Ediff Emacs Lisp code
|
|
|
17 ediff-util.el -- Ediff Emacs Lisp code
|
|
|
18 ediff-diff.el -- Ediff Emacs Lisp code
|
|
|
19 ediff-merg.el -- Ediff Emacs Lisp code
|
|
|
20 ediff-mult.el -- Ediff Emacs Lisp code
|
|
|
21 ediff-vers.el -- Ediff Emacs Lisp code
|
|
|
22 ediff-ptch.el -- Ediff Emacs Lisp code
|
|
82
|
23 ediff-tbar.el -- Ediff Emacs Lisp code -- for XEmacs only
|
|
0
|
24 ediff-hook.el -- Ediff Emacs Lisp code
|
|
82
|
25 toolbar/ -- Ediff toolbar icons -- for XEmacs only
|
|
0
|
26
|
|
|
27
|
|
|
28 To install Ediff do:
|
|
|
29
|
|
|
30 uncompress ediff.tar.Z
|
|
|
31 tar xf ediff.tar
|
|
|
32
|
|
|
33
|
|
|
34 Then do the following:
|
|
|
35
|
|
|
36 1. To compile Lisp:
|
|
|
37
|
|
|
38 make (or 'make all')
|
|
|
39
|
|
|
40 2. You can also type
|
|
|
41
|
|
|
42 make install
|
|
|
43
|
|
|
44 to do what "make all" does plus it will copy the files ediff*.elc
|
|
|
45 into a suitable Lisp directory.
|
|
|
46
|
|
|
47 To make this happen, you will most likely have to change the PREFIX
|
|
|
48 variable in Makefile and, possibly, one or more of these variables:
|
|
|
49
|
|
|
50 DATADIR, LISPDIR, INFODIR, ETCDIR, and VERSION
|
|
|
51
|
|
|
52 if they don't point to the right directories in your installation.
|
|
|
53 You also need to have a write permission for all directories
|
|
|
54 mentioned in LISPDIR, INFODIR, and ETCDIR.
|
|
|
55
|
|
|
56 3. XEmacs users must invoke `make' with the parameter EMACS=xemacs
|
|
|
57 or whatever name is used to invoke XEmacs (some sites still use xemacs
|
|
|
58 for Emacs 18). An even better thing would be to edit Makefile directly
|
|
|
59 as indicated in the comments there.
|
|
|
60
|
|
82
|
61 4. Under XEmacs, copy the icons in the `toolbar' directory into
|
|
|
62 the-directory-where-xemacs-installed/etc/toolbar/
|
|
0
|
63
|
|
82
|
64 Normally, all Ediff menus and autoloads are already defined in Emacs, so you
|
|
0
|
65 don't need to define anything in your .emacs to run Ediff.
|
|
|
66 However, if it was announced that this distribution of Ediff contains
|
|
82
|
67 new features, you may need to put
|
|
0
|
68
|
|
|
69 (require 'ediff-hook)
|
|
|
70
|
|
|
71 in your .emacs to take advantage of these new features. This doesn't load
|
|
82
|
72 Ediff, but readies Emacs for the things to come. When this version of
|
|
|
73 Ediff gets installed in the standard Emacs distribution, you can remove
|
|
0
|
74 the above require-statement (but leaving it in does no harm).
|
