Mercurial > emacs

changeset 94560:9154a25c84c6

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
(minibuffer-with-setup-hook): Allow `fun' expressions rather than only value.
author Stefan Monnier <monnier@iro.umontreal.ca>
date Fri, 02 May 2008 17:22:04 +0000
parents 687d0af3b0f3
children bbc1b1a5633e
files lisp/ChangeLog lisp/files.el
diffstat 2 files changed, 4 insertions(+), 1 deletions(-) [+]
line wrap: on
line diff
--- 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.
 
--- 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)