diff options
| author | Lars Ingebrigtsen <larsi@gnus.org> | 2020-08-18 11:55:29 +0200 |
|---|---|---|
| committer | Lars Ingebrigtsen <larsi@gnus.org> | 2020-08-18 11:55:29 +0200 |
| commit | 85f0e3df73e1a2c0a355e224b97db017a1fb4adf (patch) | |
| tree | 69a31a7265bbc0d975a3a1628c24a1e2a5edab6b /lisp/vc/ediff-util.el | |
| parent | 8d7a7c16a8627295267a5021b14ecd631a339d5f (diff) | |
| download | emacs-85f0e3df73e1a2c0a355e224b97db017a1fb4adf.tar.gz | |
Remove some compat code from ediff-util.el
* lisp/vc/ediff-util.el (ediff-minibuffer-with-setup-hook): Make
into an obsolete macro.
(ediff-read-file-name): Adjust caller.
Diffstat (limited to 'lisp/vc/ediff-util.el')
| -rw-r--r-- | lisp/vc/ediff-util.el | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/lisp/vc/ediff-util.el b/lisp/vc/ediff-util.el index 4a84c1ecd9c..e31f43dded3 100644 --- a/lisp/vc/ediff-util.el +++ b/lisp/vc/ediff-util.el @@ -3069,10 +3069,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 +3099,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 |