Mercurial > emacs
diff lisp/ediff-init.el @ 29165:641e43bad886
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.
| author | Michael Kifer <kifer@cs.stonybrook.edu> |
|---|---|
| date | Wed, 24 May 2000 17:31:16 +0000 |
| parents | 3ec5a485d0ab |
| children | ecd388a0937d |
line wrap: on
line diff
--- a/lisp/ediff-init.el Wed May 24 17:19:51 2000 +0000 +++ b/lisp/ediff-init.el Wed May 24 17:31:16 2000 +0000 @@ -1206,6 +1206,11 @@ ;; 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.