diff options
| author | Juri Linkov <juri@jurta.org> | 2009-11-29 23:52:16 +0000 |
|---|---|---|
| committer | Juri Linkov <juri@jurta.org> | 2009-11-29 23:52:16 +0000 |
| commit | f8d170a48f48e0911235344777d14ce060b6b61c (patch) | |
| tree | e7d81e3349d9cd10f9d3ef760fd90a1ff1617bb3 /lisp/ediff-util.el | |
| parent | 5aa75bd88999cae8af18bcbe6055881680c8e064 (diff) | |
| download | emacs-f8d170a48f48e0911235344777d14ce060b6b61c.tar.gz | |
(ediff-minibuffer-with-setup-hook): New compatibility macro.
(ediff-read-file-name): Use it instead of `minibuffer-with-setup-hook'.
Diffstat (limited to 'lisp/ediff-util.el')
| -rw-r--r-- | lisp/ediff-util.el | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/lisp/ediff-util.el b/lisp/ediff-util.el index e8a171bf517..4dfd6f60518 100644 --- a/lisp/ediff-util.el +++ b/lisp/ediff-util.el @@ -3091,6 +3091,12 @@ 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)) + ;; 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. @@ -3118,7 +3124,7 @@ Hit \\[ediff-recenter] to reset the windows afterward." (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 |