2 files changed, 4 insertions, 1 deletions

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index f79c5fc850b..bf1265a835d 100644
--- 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 38eb95fe9bd..221074ae329 100644
--- 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)