Mercurial > hg > xemacs-beta

comparison lisp/ediff/README @ 16:0293115a14e9 r19-15b91

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Import from CVS: tag r19-15b91
author cvs
date Mon, 13 Aug 2007 08:49:20 +0200
parents 9ee227acff29
children 131b0175ea99
comparison
equal deleted inserted replaced
15:ad457d5f7d04 16:0293115a14e9
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.30 or XEmacs 19.14 3 **** This version of Ediff requires *at least* Emacs 19.34 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
18 ediff-diff.el -- Ediff Emacs Lisp code 18 ediff-diff.el -- Ediff Emacs Lisp code
19 ediff-merg.el -- Ediff Emacs Lisp code 19 ediff-merg.el -- Ediff Emacs Lisp code
20 ediff-mult.el -- Ediff Emacs Lisp code 20 ediff-mult.el -- Ediff Emacs Lisp code
21 ediff-vers.el -- Ediff Emacs Lisp code 21 ediff-vers.el -- Ediff Emacs Lisp code
22 ediff-ptch.el -- Ediff Emacs Lisp code 22 ediff-ptch.el -- Ediff Emacs Lisp code
23 ediff-tbar.el -- Ediff Emacs Lisp code -- this one only for XEmacs 23 ediff-tbar.el -- Ediff Emacs Lisp code -- for XEmacs only
24 ediff-hook.el -- Ediff Emacs Lisp code 24 ediff-hook.el -- Ediff Emacs Lisp code
25 toolbar/ -- Ediff toolbar icons -- for XEmacs only
25 26
26 27
27 To install Ediff do: 28 To install Ediff do:
28 29
29 uncompress ediff.tar.Z 30 uncompress ediff.tar.Z
55 3. XEmacs users must invoke `make' with the parameter EMACS=xemacs 56 3. XEmacs users must invoke `make' with the parameter EMACS=xemacs
56 or whatever name is used to invoke XEmacs (some sites still use xemacs 57 or whatever name is used to invoke XEmacs (some sites still use xemacs
57 for Emacs 18). An even better thing would be to edit Makefile directly 58 for Emacs 18). An even better thing would be to edit Makefile directly
58 as indicated in the comments there. 59 as indicated in the comments there.
59 60
60 For manual installation, copy ediff*.elc into a directory on your load-path. 61 4. Under XEmacs, copy the icons in the `toolbar' directory into
62 the-directory-where-xemacs-installed/etc/toolbar/
61 63
62 For more details, read documentation at the beginning of the file ediff.el 64 Normally, all Ediff menus and autoloads are already defined in Emacs, so you
63
64 To install on-line documentation, you need to install the Info files
65 by copying
66
67 ediff.info*
68
69 into your Info directory (which is emacs-root-dir/info,
70 if emacs-root-dir is the root directory of the installation).
71
72 Then edit the file
73
74 emacs-root-dir/info/dir
75
76 to include the root menu item for Ediff (check how other menu
77 items look like in this file).
78
79 In Emacs, this item should look like this:
80
81 * Ediff: (ediff.info). A Visual Interface to Unix Diff and Patch Utilities
82
83 In XEmacs, it looks like:
84
85 * Ediff:: A Visual Interface to Unix Diff and Patch Utilities
86
87
88 Normally, all Ediff menus and autoloads are already defined in Emacs, so u
89 don't need to define anything in your .emacs to run Ediff. 65 don't need to define anything in your .emacs to run Ediff.
90 However, if it was announced that this distribution of Ediff contains 66 However, if it was announced that this distribution of Ediff contains
91 new features, you may have to put 67 new features, you may need to put
92 68
93 (require 'ediff-hook) 69 (require 'ediff-hook)
94 70
95 in your .emacs to take advantage of these new features. This doesn't load 71 in your .emacs to take advantage of these new features. This doesn't load
96 Ediff, but readies it for any taks u assign to it. When this version of 72 Ediff, but readies Emacs for the things to come. When this version of
97 Ediff gets installed in the standard Emacs distribution, you may remove 73 Ediff gets installed in the standard Emacs distribution, you can remove
98 the above require-statement (but leaving it in does no harm). 74 the above require-statement (but leaving it in does no harm).