diff options
| author | Michael Kifer <kifer@cs.stonybrook.edu> | 2001-12-24 05:50:31 +0000 |
|---|---|---|
| committer | Michael Kifer <kifer@cs.stonybrook.edu> | 2001-12-24 05:50:31 +0000 |
| commit | b9fe4732f60bef14008aa9c4735d45f23fd8f670 (patch) | |
| tree | a1143820e91e6ead088b0b85b24f9388cceace95 /man/ediff.texi | |
| parent | ea8d3061370eb3c02cc659eb0b013a358de853b2 (diff) | |
| download | emacs-b9fe4732f60bef14008aa9c4735d45f23fd8f670.tar.gz | |
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.
Diffstat (limited to 'man/ediff.texi')
| -rw-r--r-- | man/ediff.texi | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/man/ediff.texi b/man/ediff.texi index ed1dbe01e8b..63cbaf53ee6 100644 --- a/man/ediff.texi +++ b/man/ediff.texi @@ -27,7 +27,7 @@ @comment %**end of header (This is for running Texinfo on a region.) @ifinfo -This file documents Ediff, a comprehensive visual interface to diff +This file documents Ediff, a comprehensive visual interface to Unix diff and patch utilities. Copyright 1995, 1996, 1997, 1998, 1999, 2000, 2001 Free Software Foundation, Inc. @@ -123,7 +123,7 @@ Furthermore, Ediff is equipped with directory-level capabilities that allow the user to conveniently launch browsing or merging sessions on groups of files in two (or three) different directories. -In addition, Ediff can apply a patch to a file and then let you step though +In addition, Ediff can apply a patch to a file and then let you step through both files, the patched and the original one, simultaneously, difference-by-difference. You can even apply a patch right out of a mail buffer, i.e., patches received by mail don't even have to be saved. Since @@ -1071,7 +1071,7 @@ set on a per-buffer basis. Therefore, use @code{setq-default} to change this variable globally. @cindex Multi-file patches -A multi-file patch is a concatenated output of several runs of the +A multi-file patch is a concatenated output of several runs of the Unix @code{diff} command (some versions of @code{diff} let you create a multi-file patch in just one run). Ediff facilitates creation of multi-file patches as follows. If you are in a session group buffer @@ -1821,8 +1821,8 @@ format yet. @vindex ediff-coding-system-for-read This variable specifies the coding system to use when reading the output that the programs @code{diff3} and @code{diff} send to Emacs. The default -is @code{raw-text}, and this should work fine on GNU, Unix, and in most -cases under Windows NT/95/98/2000. There are @code{diff} programs +is @code{raw-text}, and this should work fine in Unix and in most +cases under Windows NT/95/98/2000. There are @code{diff} programs for which the default option doesn't work under Windows. In such cases, @code{raw-text-dos} might work. If not, you will have to experiment with other coding systems or use GNU diff. |