Mercurial > emacs
comparison man/ediff.texi @ 42288:3ce98f3e0608
2001-12-24 Michael Kifer <kifer@cs.sunysb.edu>
* viper-cmd.el (viper-change-state): Got rid of make-local-hook.
(viper-special-read-and-insert-char): Make C-m work right in the r
comand.
(viper-buffer-search-enable): Fixed format string.
* viper-ex.el (ex-token-alist): Use ex-set-visited-file-name
instead of viper-info-on-file.
(ex-set-visited-file-name): New function.
* viper.el (viper-emacs-state-mode-list): Added mail-mode.
* ediff-mult.el (ediff-meta-mark-equal-files): Added optional
action argument.
* ediff-init.el: Fixed some doc strings.
* ediff-util.el (ediff-after-quit-hook-internal): New variable.
Got rid of make-local-hook.
* ediff-wind.el (ediff-setup-control-frame): Got rid of
make-local-hook.
author | Michael Kifer <kifer@cs.stonybrook.edu> |
---|---|
date | Mon, 24 Dec 2001 05:50:31 +0000 |
parents | 62e02f5ae533 |
children | 633233bf2bbf |
comparison
equal
deleted
inserted
replaced
42287:c95e74201401 | 42288:3ce98f3e0608 |
---|---|
25 @end iftex | 25 @end iftex |
26 @c @smallbook | 26 @c @smallbook |
27 @comment %**end of header (This is for running Texinfo on a region.) | 27 @comment %**end of header (This is for running Texinfo on a region.) |
28 | 28 |
29 @ifinfo | 29 @ifinfo |
30 This file documents Ediff, a comprehensive visual interface to diff | 30 This file documents Ediff, a comprehensive visual interface to Unix diff |
31 and patch utilities. | 31 and patch utilities. |
32 | 32 |
33 Copyright 1995, 1996, 1997, 1998, 1999, 2000, 2001 Free Software Foundation, Inc. | 33 Copyright 1995, 1996, 1997, 1998, 1999, 2000, 2001 Free Software Foundation, Inc. |
34 | 34 |
35 Permission is granted to copy, distribute and/or modify this document | 35 Permission is granted to copy, distribute and/or modify this document |
121 third buffer. Merging with an ancestor file is also supported. | 121 third buffer. Merging with an ancestor file is also supported. |
122 Furthermore, Ediff is equipped with directory-level capabilities that | 122 Furthermore, Ediff is equipped with directory-level capabilities that |
123 allow the user to conveniently launch browsing or merging sessions on | 123 allow the user to conveniently launch browsing or merging sessions on |
124 groups of files in two (or three) different directories. | 124 groups of files in two (or three) different directories. |
125 | 125 |
126 In addition, Ediff can apply a patch to a file and then let you step though | 126 In addition, Ediff can apply a patch to a file and then let you step through |
127 both files, the patched and the original one, simultaneously, | 127 both files, the patched and the original one, simultaneously, |
128 difference-by-difference. You can even apply a patch right out of a mail | 128 difference-by-difference. You can even apply a patch right out of a mail |
129 buffer, i.e., patches received by mail don't even have to be saved. Since | 129 buffer, i.e., patches received by mail don't even have to be saved. Since |
130 Ediff lets you copy differences between variants, you can, in effect, apply | 130 Ediff lets you copy differences between variants, you can, in effect, apply |
131 patches selectively (i.e., you can copy a difference region from | 131 patches selectively (i.e., you can copy a difference region from |
1069 The variable @code{ediff-autostore-merges} is buffer-local, so it can be | 1069 The variable @code{ediff-autostore-merges} is buffer-local, so it can be |
1070 set on a per-buffer basis. Therefore, use @code{setq-default} to change | 1070 set on a per-buffer basis. Therefore, use @code{setq-default} to change |
1071 this variable globally. | 1071 this variable globally. |
1072 | 1072 |
1073 @cindex Multi-file patches | 1073 @cindex Multi-file patches |
1074 A multi-file patch is a concatenated output of several runs of the | 1074 A multi-file patch is a concatenated output of several runs of the Unix |
1075 @code{diff} command (some versions of @code{diff} let you create a | 1075 @code{diff} command (some versions of @code{diff} let you create a |
1076 multi-file patch in just one run). Ediff facilitates creation of | 1076 multi-file patch in just one run). Ediff facilitates creation of |
1077 multi-file patches as follows. If you are in a session group buffer | 1077 multi-file patches as follows. If you are in a session group buffer |
1078 created in response to @code{ediff-directories} or | 1078 created in response to @code{ediff-directories} or |
1079 @code{ediff-directory-revisions}, you can mark (by typing @kbd{m}) the | 1079 @code{ediff-directory-revisions}, you can mark (by typing @kbd{m}) the |
1819 | 1819 |
1820 @item ediff-coding-system-for-read | 1820 @item ediff-coding-system-for-read |
1821 @vindex ediff-coding-system-for-read | 1821 @vindex ediff-coding-system-for-read |
1822 This variable specifies the coding system to use when reading the output | 1822 This variable specifies the coding system to use when reading the output |
1823 that the programs @code{diff3} and @code{diff} send to Emacs. The default | 1823 that the programs @code{diff3} and @code{diff} send to Emacs. The default |
1824 is @code{raw-text}, and this should work fine on GNU, Unix, and in most | 1824 is @code{raw-text}, and this should work fine in Unix and in most |
1825 cases under Windows NT/95/98/2000. There are @code{diff} programs | 1825 cases under Windows NT/95/98/2000. There are @code{diff} programs |
1826 for which the default option doesn't work under Windows. In such cases, | 1826 for which the default option doesn't work under Windows. In such cases, |
1827 @code{raw-text-dos} might work. If not, you will have to experiment with | 1827 @code{raw-text-dos} might work. If not, you will have to experiment with |
1828 other coding systems or use GNU diff. | 1828 other coding systems or use GNU diff. |
1829 | 1829 |
1830 @item ediff-patch-program | 1830 @item ediff-patch-program |