mirror/emacs
1
0
Fork 0
mirror of https://git.savannah.gnu.org/git/emacs.git synced 2024-12-13 09:32:47 +00:00
Code Issues Releases Activity

Remove some compat code from ediff-util.el

Browse Source 
* lisp/vc/ediff-util.el (ediff-minibuffer-with-setup-hook): Make
into an obsolete macro.
(ediff-read-file-name): Adjust caller.
This commit is contained in:
Lars Ingebrigtsen 2020-08-18 11:55:29 +02:00
parent 8d7a7c16a8
commit 85f0e3df73
1 changed files with 3 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
lisp/vc/ediff-util.el
View File

@ -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