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 /lisp/ediff-init.el | |
| 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 'lisp/ediff-init.el')
| -rw-r--r-- | lisp/ediff-init.el | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/lisp/ediff-init.el b/lisp/ediff-init.el index 08490c4c16c..438492032ba 100644 --- a/lisp/ediff-init.el +++ b/lisp/ediff-init.el @@ -1206,6 +1206,11 @@ as `ediff-merge-directory' or `ediff-merge-directory-revisions'." ;; file where the result of the merge is to be saved. used internally (ediff-defvar-local ediff-merge-store-file nil "") + +(defcustom ediff-merge-filename-prefix "merge_" + "*Prefix to be attached to saved merge buffers." + :type 'string + :group 'ediff-merge) (defcustom ediff-no-emacs-help-in-control-buffer nil "*Non-nil means C-h should not invoke Emacs help in control buffer. |