diff options
Diffstat (limited to 'lisp/vc/ediff-util.el')
| -rw-r--r-- | lisp/vc/ediff-util.el | 22 |
1 files changed, 9 insertions, 13 deletions
diff --git a/lisp/vc/ediff-util.el b/lisp/vc/ediff-util.el index 4a84c1ecd9c..f56d31c7136 100644 --- a/lisp/vc/ediff-util.el +++ b/lisp/vc/ediff-util.el @@ -240,18 +240,16 @@ to invocation.") startup-hooks setup-parameters &optional merge-buffer-file) (run-hooks 'ediff-before-setup-hook) - ;; ediff-convert-standard-filename puts file names in the form appropriate + ;; convert-standard-filename puts file names in the form appropriate ;; for the OS at hand. - (setq file-A (ediff-convert-standard-filename (expand-file-name file-A))) - (setq file-B (ediff-convert-standard-filename (expand-file-name file-B))) + (setq file-A (convert-standard-filename (expand-file-name file-A))) + (setq file-B (convert-standard-filename (expand-file-name file-B))) (if (stringp file-C) - (setq file-C - (ediff-convert-standard-filename (expand-file-name file-C)))) + (setq file-C (convert-standard-filename (expand-file-name file-C)))) (if (stringp merge-buffer-file) (progn (setq merge-buffer-file - (ediff-convert-standard-filename - (expand-file-name merge-buffer-file))) + (convert-standard-filename (expand-file-name merge-buffer-file))) ;; check the directory exists (or (file-exists-p (file-name-directory merge-buffer-file)) (error "Directory %s given as place to save the merge doesn't exist" @@ -3069,10 +3067,8 @@ Hit \\[ediff-recenter] to reset the windows afterward." ;; for compatibility -(defmacro ediff-minibuffer-with-setup-hook (fun &rest body) - `(if (fboundp 'minibuffer-with-setup-hook) - (minibuffer-with-setup-hook ,fun ,@body) - ,@body)) +(define-obsolete-function-alias 'ediff-minibuffer-with-setup-hook + #'minibuffer-with-setup-hook "28.1") ;; This is adapted from a similar function in `emerge.el'. ;; PROMPT should not have a trailing ': ', so that it can be modified @@ -3101,7 +3097,7 @@ Hit \\[ediff-recenter] to reset the windows afterward." (and default-file (list default-file)) default-dir))) f) - (setq f (ediff-minibuffer-with-setup-hook + (setq f (minibuffer-with-setup-hook (lambda () (when defaults (setq minibuffer-default defaults))) (read-file-name @@ -3134,7 +3130,7 @@ Hit \\[ediff-recenter] to reset the windows afterward." ;; Also, save buffer from START to END in the file. ;; START defaults to (point-min), END to (point-max) (defun ediff-make-temp-file (buff &optional prefix given-file start end) - (let* ((p (ediff-convert-standard-filename (or prefix "ediff"))) + (let* ((p (convert-standard-filename (or prefix "ediff"))) (short-p p) (coding-system-for-write ediff-coding-system-for-write) f short-f) |