Mercurial > hg > xemacs-beta

comparison lisp/ediff/README @ 70:131b0175ea99 r20-0b30

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Import from CVS: tag r20-0b30
author cvs
date Mon, 13 Aug 2007 09:02:59 +0200
parents 0293115a14e9
children c7528f8e288d
comparison
equal deleted inserted replaced
69:804d1389bcd6 70:131b0175ea99
1 **** EDIFF -- a comprehensive interface to diff for Emacs 19 and XEmacs 19 1 **** EDIFF -- a comprehensive interface to diff for Emacs 19 and XEmacs 19
2 2
3 **** This version of Ediff requires *at least* Emacs 19.34 or XEmacs 19.14 3 **** This version of Ediff requires *at least* Emacs 19.30 or XEmacs 19.14
4 4
5 This directory: 5 This directory:
6 6
7 README -- This file 7 README -- This file
8 Makefile -- Automated installation file 8 Makefile -- Automated installation file
9 ediff.texi -- Manual in Texinfo format 9 ediff.texi -- Manual in Texinfo format
10 ediff, ediff-? -- The Info files 10 ediff.info* -- The Info files
11 ediff.dvi -- Manual in DVI format 11 ediff.dvi -- Manual in DVI format
12 12
13 ediff.el -- Ediff Emacs Lisp code 13 ediff.el -- Ediff Emacs Lisp code
14 ediff-init.el -- Ediff Emacs Lisp code 14 ediff-init.el -- Ediff Emacs Lisp code
15 ediff-help.el -- Ediff Emacs Lisp code
16 ediff-wind.el -- Ediff Emacs Lisp code 15 ediff-wind.el -- Ediff Emacs Lisp code
17 ediff-util.el -- Ediff Emacs Lisp code 16 ediff-util.el -- Ediff Emacs Lisp code
18 ediff-diff.el -- Ediff Emacs Lisp code 17 ediff-diff.el -- Ediff Emacs Lisp code
19 ediff-merg.el -- Ediff Emacs Lisp code 18 ediff-merg.el -- Ediff Emacs Lisp code
20 ediff-mult.el -- Ediff Emacs Lisp code 19 ediff-mult.el -- Ediff Emacs Lisp code
21 ediff-vers.el -- Ediff Emacs Lisp code 20 ediff-vers.el -- Ediff Emacs Lisp code
22 ediff-ptch.el -- Ediff Emacs Lisp code 21 ediff-ptch.el -- Ediff Emacs Lisp code
23 ediff-tbar.el -- Ediff Emacs Lisp code -- for XEmacs only
24 ediff-hook.el -- Ediff Emacs Lisp code 22 ediff-hook.el -- Ediff Emacs Lisp code
25 toolbar/ -- Ediff toolbar icons -- for XEmacs only
26 23
27 24
28 To install Ediff do: 25 To install Ediff do:
29 26
30 uncompress ediff.tar.Z 27 uncompress ediff.tar.Z
56 3. XEmacs users must invoke `make' with the parameter EMACS=xemacs 53 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 54 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 55 for Emacs 18). An even better thing would be to edit Makefile directly
59 as indicated in the comments there. 56 as indicated in the comments there.
60 57
61 4. Under XEmacs, copy the icons in the `toolbar' directory into 58 For manual installation, copy ediff*.elc into a directory on your load-path.
62 the-directory-where-xemacs-installed/etc/toolbar/
63 59
64 Normally, all Ediff menus and autoloads are already defined in Emacs, so you 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
65 don't need to define anything in your .emacs to run Ediff. 87 don't need to define anything in your .emacs to run Ediff.
66 However, if it was announced that this distribution of Ediff contains 88 However, if it was announced that this distribution of Ediff contains
67 new features, you may need to put 89 new features, you may have to put
68 90
69 (require 'ediff-hook) 91 (require 'ediff-hook)
70 92
71 in your .emacs to take advantage of these new features. This doesn't load 93 in your .emacs to take advantage of these new features. This doesn't load
72 Ediff, but readies Emacs for the things to come. When this version of 94 Ediff, but readies it for any taks u assign to it. When this version of
73 Ediff gets installed in the standard Emacs distribution, you can remove 95 Ediff gets installed in the standard Emacs distribution, you may remove
74 the above require-statement (but leaving it in does no harm). 96 the above require-statement (but leaving it in does no harm).