diff options
Diffstat (limited to 'lisp')
| -rw-r--r-- | lisp/ChangeLog | 4 | ||||
| -rw-r--r-- | lisp/files.el | 8 |
2 files changed, 10 insertions, 2 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 1fa330e8e2a..65877141083 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,3 +1,7 @@ +2010-01-01 Chong Yidong <cyd@stupidchicken.com> + + * files.el (minibuffer-with-setup-hook): Doc fix (Bug#5149). + 2010-01-01 Juri Linkov <juri@jurta.org> * comint.el (comint-input-ring-size): Make it a defcustom and diff --git a/lisp/files.el b/lisp/files.el index 6cfc727686e..22f5936a1f6 100644 --- a/lisp/files.el +++ b/lisp/files.el @@ -1284,9 +1284,13 @@ its documentation for additional customization information." )) (defmacro minibuffer-with-setup-hook (fun &rest body) - "Add FUN to `minibuffer-setup-hook' while executing BODY. + "Temporarily add FUN to `minibuffer-setup-hook' while executing BODY. BODY should use the minibuffer at most once. -Recursive uses of the minibuffer will not be affected." +Recursive uses of the minibuffer are unaffected (FUN is not +called additional times). + +This macro actually adds an auxilliary function that calls FUN, +rather than FUN itself, to `minibuffer-setup-hook'." (declare (indent 1) (debug t)) (let ((hook (make-symbol "setup-hook"))) `(let (,hook) |