[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
master 85f0e3d 2/9: Remove some compat code from ediff-util.el
From: |
Lars Ingebrigtsen |
Subject: |
master 85f0e3d 2/9: Remove some compat code from ediff-util.el |
Date: |
Tue, 18 Aug 2020 06:12:37 -0400 (EDT) |
branch: master
commit 85f0e3df73e1a2c0a355e224b97db017a1fb4adf
Author: Lars Ingebrigtsen <larsi@gnus.org>
Commit: Lars Ingebrigtsen <larsi@gnus.org>
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.
---
lisp/vc/ediff-util.el | 8 +++-----
1 file changed, 3 insertions(+), 5 deletions(-)
diff --git a/lisp/vc/ediff-util.el b/lisp/vc/ediff-util.el
index 4a84c1e..e31f43d 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
- master updated (b14c1b5 -> 75233e3), Lars Ingebrigtsen, 2020/08/18
- master 8d7a7c1 1/9: Remove XEmacs compat code from idlwave.el, Lars Ingebrigtsen, 2020/08/18
- master 848a38a 4/9: Remove some compat code from ispell.el, Lars Ingebrigtsen, 2020/08/18
- master 60f045b 5/9: Remove some compat code from binhex.el and uudecode.el, Lars Ingebrigtsen, 2020/08/18
- master 033f98e 6/9: Remove some compat code from python.el, Lars Ingebrigtsen, 2020/08/18
- master 9384674 7/9: Remove some compat code from ede/make.el and semantic/dep.el, Lars Ingebrigtsen, 2020/08/18
- master 75233e3 9/9: Remove some compat code from esh-io.el, Lars Ingebrigtsen, 2020/08/18
- master 85f0e3d 2/9: Remove some compat code from ediff-util.el,
Lars Ingebrigtsen <=
- master c64fcb8 3/9: Remove some compat code from uudecode.el, Lars Ingebrigtsen, 2020/08/18
- master e0e3fe4 8/9: Remove some compat code from ediff, Lars Ingebrigtsen, 2020/08/18