diff options
| author | Michael Kifer <[email protected]> | 2000-05-24 17:31:16 +0000 |
|---|---|---|
| committer | Michael Kifer <[email protected]> | 2000-05-24 17:31:16 +0000 |
| commit | 6de3983ff852778ba46ce3ae019b16ded5a14880 (patch) | |
| tree | 33e57713f75020c2db9e41e3f5ebc12567502318 /man | |
| parent | 8217260645b7930ca09a6efefae40a83edc26f7b (diff) | |
2000-05-24 Michael Kifer <[email protected]>
* 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')
| -rw-r--r-- | man/ediff.texi | 10 | ||||
| -rw-r--r-- | man/viper.texi | 4 |
2 files changed, 11 insertions, 3 deletions
diff --git a/man/ediff.texi b/man/ediff.texi index d0832ec68f..d3d28cd531 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 diff --git a/man/viper.texi b/man/viper.texi index 655a8c5983..5c5ca62063 100644 --- a/man/viper.texi +++ b/man/viper.texi @@ -2031,7 +2031,8 @@ If you wish to change a Viper binding, you can use the @code{define-key} command, to modify @code{viper-vi-global-user-map}, @code{viper-insert-global-user-map}, and @code{viper-emacs-global-user-map}, as explained below. Each of these key maps affects the corresponding Viper state. -The keymap @code{viper-vi-global-user-map} also affects Viper's Replace state. +The keymap @code{viper-insert-global-user-map} also affects Viper's Replace +state. @noindent If you want to @@ -4442,6 +4443,7 @@ kanze@@gabi-soft.fr (James Kanze), kin@@isi.com (Kin Cho), kwzh@@gnu.org (Karl Heuer), lindstro@@biostat.wisc.edu (Mary Lindstrom), +minakaji@@osaka.email.ne.jp (Mikio Nakajima), Mark.Bordas@@East.Sun.COM (Mark Bordas), meyering@@comco.com (Jim Meyering), mrb@@Eng.Sun.COM (Martin Buchholz), |