diff options
| author | Michael Kifer <kifer@cs.stonybrook.edu> | 2000-05-24 17:31:16 +0000 |
|---|---|---|
| committer | Michael Kifer <kifer@cs.stonybrook.edu> | 2000-05-24 17:31:16 +0000 |
| commit | 6de3983ff852778ba46ce3ae019b16ded5a14880 (patch) | |
| tree | 33e57713f75020c2db9e41e3f5ebc12567502318 /man/ediff.texi | |
| parent | 8217260645b7930ca09a6efefae40a83edc26f7b (diff) | |
| download | emacs-6de3983ff852778ba46ce3ae019b16ded5a14880.tar.gz | |
2000-05-24 Michael Kifer <kifer@cs.sunysb.edu>
* ediff-diff.el (ediff-forward-word): take syntactic word class into
account.
(ediff-test-utility,ediff-diff-mandatory-option,
ediff-reset-diff-options): utilities for proper initialization of
ediff-diff-options and ediff-diff3-options on Windows.
* ediff-init.el (ediff-merge-filename-prefix): new customizable
variable.
* ediff-mult.el (ediff-filegroup-action): use
ediff-merge-filename-prefix.
Diffstat (limited to 'man/ediff.texi')
| -rw-r--r-- | man/ediff.texi | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/man/ediff.texi b/man/ediff.texi index d0832ec68f5..d3d28cd531a 100644 --- a/man/ediff.texi +++ b/man/ediff.texi @@ -975,8 +975,8 @@ invoked from a session group. This behavior is implemented in the function necessary. The variable @code{ediff-autostore-merges} is buffer-local, so it can be -set in a per-buffer manner. Therefore, use @code{setq-default} to globally -change this variable. +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 Unix @@ -1980,6 +1980,12 @@ The variable @code{ediff-autostore-merges} is buffer-local, so it can be set in a per-buffer manner. Therefore, use @code{setq-default} to globally change this variable. +@vindex ediff-merge-filename-prefix +When merge buffers are saved automatically as directed by +@code{ediff-autostore-merges}, Ediff attaches a prefix to each file, as +specified by the variable @code{ediff-merge-filename-prefix}. The default +is @code{merge_}, but this can be changed by the user. + @node Support for Version Control, Customizing the Mode Line, Merging and diff3, Customization @section Support for Version Control |