+2009-11-29 Juri Linkov <juri@jurta.org>
+
+ * ediff-util.el (ediff-minibuffer-with-setup-hook):
+ New compatibility macro.
+ (ediff-read-file-name): Use it instead of
+ `minibuffer-with-setup-hook'.
+
2009-11-29 Juri Linkov <juri@jurta.org>
Add defcustom to define the cycling order of `recenter-top-bottom'.
)
+;; for compatibility
+(defmacro ediff-minibuffer-with-setup-hook (fun &rest body)
+ `(if (fboundp 'minibuffer-with-setup-hook)
+ (minibuffer-with-setup-hook ,fun ,@body)
+ ,@body))
+
;; This is adapted from a similar function in `emerge.el'.
;; PROMPT should not have a trailing ': ', so that it can be modified
;; according to context.
(and default-file (list default-file))
default-dir)))
f)
- (setq f (minibuffer-with-setup-hook
+ (setq f (ediff-minibuffer-with-setup-hook
(lambda () (when defaults
(setq minibuffer-default defaults)))
(read-file-name