Mercurial > emacs
diff lisp/ediff-mult.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 | 6306740f6938 |
line wrap: on
line diff
--- a/lisp/ediff-mult.el Wed May 24 17:19:51 2000 +0000 +++ b/lisp/ediff-mult.el Wed May 24 17:31:16 2000 +0000 @@ -1587,7 +1587,7 @@ merge-autostore-dir) (concat merge-autostore-dir - "merge_" + ediff-merge-filename-prefix (file-name-nondirectory file1)) )) ;; make ediff-startup pass @@ -1618,7 +1618,7 @@ merge-autostore-dir) (concat merge-autostore-dir - "merge_" + ediff-merge-filename-prefix (file-name-nondirectory file1))) ) ;; make ediff-startup pass ;; ediff-control-buffer back to the meta @@ -1647,7 +1647,7 @@ merge-autostore-dir) (concat merge-autostore-dir - "merge_" + ediff-merge-filename-prefix (file-name-nondirectory file1))) ) ;; make ediff-startup pass ;; ediff-control-buffer back to the meta @@ -1673,7 +1673,7 @@ merge-autostore-dir) (concat merge-autostore-dir - "merge_" + ediff-merge-filename-prefix (file-name-nondirectory file1))) ) (setq ediff-meta-buffer , (current-buffer) ediff-meta-session-number