diff options
| author | Chong Yidong | 2010-01-01 15:03:37 -0500 |
|---|---|---|
| committer | Chong Yidong | 2010-01-01 15:03:37 -0500 |
| commit | 9bbe0828a0871985dfc8e1ba82020280efdaeb36 (patch) | |
| tree | b00e49c137f909bc675f2a9f3add7d6a6fe6003a | |
| parent | 918fa8ba98b1a5a2b94879c092abefeab5dfe85c (diff) | |
| download | emacs-9bbe0828a0871985dfc8e1ba82020280efdaeb36.tar.gz emacs-9bbe0828a0871985dfc8e1ba82020280efdaeb36.zip | |
* lisp/files.el (minibuffer-with-setup-hook): Doc fix (Bug#5149).
| -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 @@ | |||
| 1 | 2010-01-01 Chong Yidong <cyd@stupidchicken.com> | ||
| 2 | |||
| 3 | * files.el (minibuffer-with-setup-hook): Doc fix (Bug#5149). | ||
| 4 | |||
| 1 | 2010-01-01 Juri Linkov <juri@jurta.org> | 5 | 2010-01-01 Juri Linkov <juri@jurta.org> |
| 2 | 6 | ||
| 3 | * comint.el (comint-input-ring-size): Make it a defcustom and | 7 | * 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." | |||
| 1284 | )) | 1284 | )) |
| 1285 | 1285 | ||
| 1286 | (defmacro minibuffer-with-setup-hook (fun &rest body) | 1286 | (defmacro minibuffer-with-setup-hook (fun &rest body) |
| 1287 | "Add FUN to `minibuffer-setup-hook' while executing BODY. | 1287 | "Temporarily add FUN to `minibuffer-setup-hook' while executing BODY. |
| 1288 | BODY should use the minibuffer at most once. | 1288 | BODY should use the minibuffer at most once. |
| 1289 | Recursive uses of the minibuffer will not be affected." | 1289 | Recursive uses of the minibuffer are unaffected (FUN is not |
| 1290 | called additional times). | ||
| 1291 | |||
| 1292 | This macro actually adds an auxilliary function that calls FUN, | ||
| 1293 | rather than FUN itself, to `minibuffer-setup-hook'." | ||
| 1290 | (declare (indent 1) (debug t)) | 1294 | (declare (indent 1) (debug t)) |
| 1291 | (let ((hook (make-symbol "setup-hook"))) | 1295 | (let ((hook (make-symbol "setup-hook"))) |
| 1292 | `(let (,hook) | 1296 | `(let (,hook) |