(minibuffer-with-setup-hook): Allow `fun' expressions rather than only value.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index f79c5fc850b9ecf00c64bdb4d2da5d996a781493..bf1265a835d7e2887c8f6aa55d3305c37b3669f3 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,5 +1,8 @@
 2008-05-02  Stefan Monnier  <monnier@iro.umontreal.ca>
 
+       * files.el (minibuffer-with-setup-hook): Allow `fun' expressions rather
+       than only value.
+
        * dired.el (dired-read-dir-and-switches):
        Set minibuffer-completing-file-name and call substitute-in-file-name.
 

diff --git a/lisp/files.el b/lisp/files.el
index 38eb95fe9bd8b99f391c4eaa40917cd1246b2b9c..221074ae329aac7483a4d9bcd165366c9004ba70 100644 (file)
--- a/lisp/files.el
+++ b/lisp/files.el
@@ -1124,7 +1124,7 @@ Recursive uses of the minibuffer will not be affected."
               ;; Clear out this hook so it does not interfere
               ;; with any recursive minibuffer usage.
               (remove-hook 'minibuffer-setup-hook ,hook)
-              (,fun)))
+              (funcall ,fun)))
        (unwind-protect
           (progn
             (add-hook 'minibuffer-setup-hook ,hook)