# HG changeset patch
# User Stefan Monnier <monnier@iro.umontreal.ca>
# Date 1209748924 0
# Node ID 9154a25c84c6bb521da9af42eb9e69504052d764
# Parent  687d0af3b0f3e530a3dcbb3624af34e95c5c3e57
(minibuffer-with-setup-hook): Allow `fun' expressions rather than only value.

diff -r 687d0af3b0f3 -r 9154a25c84c6 lisp/ChangeLog
--- a/lisp/ChangeLog	Fri May 02 17:20:07 2008 +0000
+++ b/lisp/ChangeLog	Fri May 02 17:22:04 2008 +0000
@@ -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 -r 687d0af3b0f3 -r 9154a25c84c6 lisp/files.el
--- a/lisp/files.el	Fri May 02 17:20:07 2008 +0000
+++ b/lisp/files.el	Fri May 02 17:22:04 2008 +0000
@@ -1124,7 +1124,7 @@
 	       ;; 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)