diff options
| author | Michael Kifer <kifer@cs.stonybrook.edu> | 1997-09-06 04:16:05 +0000 |
|---|---|---|
| committer | Michael Kifer <kifer@cs.stonybrook.edu> | 1997-09-06 04:16:05 +0000 |
| commit | bd698e987e71743196eb0b317e8df3d39da228d9 (patch) | |
| tree | 384fc23f1f1313eded01883014cac7a05c69ddea /lisp/ediff.el | |
| parent | a18ed1290d36e933724c5e789328195f4f9c2aff (diff) | |
| download | emacs-bd698e987e71743196eb0b317e8df3d39da228d9.tar.gz | |
new version
Diffstat (limited to 'lisp/ediff.el')
| -rw-r--r-- | lisp/ediff.el | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/lisp/ediff.el b/lisp/ediff.el index ea7d747a70a..2cbbc90164b 100644 --- a/lisp/ediff.el +++ b/lisp/ediff.el @@ -7,7 +7,7 @@ ;; Keywords: comparing, merging, patching, version control. (defconst ediff-version "2.67" "The current version of Ediff") -(defconst ediff-date "August 7, 1997" "Date of last update") +(defconst ediff-date "September 3, 1997" "Date of last update") ;; This file is part of GNU Emacs. @@ -275,7 +275,7 @@ ;; deleted. (defun ediff-find-file (file-var buffer-name &optional last-dir hooks-var) (let* ((file (symbol-value file-var)) - (file-magic (find-file-name-handler file 'find-file-noselect)) + (file-magic (ediff-filename-magic-p file)) (temp-file-name-prefix (file-name-nondirectory file))) (cond ((not (file-readable-p file)) (error "File `%s' does not exist or is not readable" file)) @@ -1182,7 +1182,8 @@ file and then run `run-ediff-from-cvs-buffer'." (t default-directory))) (setq source-file ;; the default is the directory, not the visited file name - (ediff-read-file-name "Which file to patch? " source-dir source-dir)) + (ediff-read-file-name + "Which file to patch? " source-dir (ediff-get-default-file-name))) (ediff-dispatch-file-patching-job patch-buf source-file))) ;;;###autoload @@ -1196,7 +1197,7 @@ file and then run `run-ediff-from-cvs-buffer'." patch-buf (read-buffer "Which buffer to patch? " (cond ((eq patch-buf (current-buffer)) - (window-buffer (other-window 1))) + (ediff-other-buffer (current-buffer))) (t (current-buffer))) 'must-match)))) |