aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorEli Zaretskii2015-12-19 16:35:42 +0200
committerEli Zaretskii2015-12-19 16:35:42 +0200
commit62812203fa7ec4c296dea988b61fbd34c263d212 (patch)
tree8d48e821fe0e3fc964db0310030840b5ccca1fe4
parent277d7efd24082f989c72a1a91df6ded8546bfbfb (diff)
downloademacs-62812203fa7ec4c296dea988b61fbd34c263d212.tar.gz
emacs-62812203fa7ec4c296dea988b61fbd34c263d212.zip
Document the new feature of 'minibuffer-with-setup-hook'
* lisp/files.el (minibuffer-with-setup-hook): Clarify how FUN is added to `minibuffer-setup-hook'.
-rw-r--r--etc/NEWS9
-rw-r--r--lisp/files.el6
2 files changed, 11 insertions, 4 deletions
diff --git a/etc/NEWS b/etc/NEWS
index 5f19c409722..4eedd4cda39 100644
--- a/etc/NEWS
+++ b/etc/NEWS
@@ -647,8 +647,13 @@ respectively, `show-paren-when-point-inside-paren' or
647These should be used in preference to `font-lock-fontify-buffer' when 647These should be used in preference to `font-lock-fontify-buffer' when
648called from Lisp. 648called from Lisp.
649 649
650** Macro `minibuffer-with-setup-hook' takes (:append FUN) to mean 650---
651appending FUN to `minibuffer-setup-hook'. 651** Macro `minibuffer-with-setup-hook' can optionally append a function
652to `minibuffer-setup-hook'.
653
654If the first argument of the macro is of the form `(:append FUN)',
655then FUN will be appended to `minibuffer-setup-hook', instead of
656prepending it.
652 657
653** cl-lib 658** cl-lib
654*** New functions cl-fresh-line, cl-digit-char-p and cl-parse-integer. 659*** New functions cl-fresh-line, cl-digit-char-p and cl-parse-integer.
diff --git a/lisp/files.el b/lisp/files.el
index e7f7151acbd..ea09c2a9fa4 100644
--- a/lisp/files.el
+++ b/lisp/files.el
@@ -1431,8 +1431,10 @@ return value, which may be passed as the REQUIRE-MATCH arg to
1431 1431
1432(defmacro minibuffer-with-setup-hook (fun &rest body) 1432(defmacro minibuffer-with-setup-hook (fun &rest body)
1433 "Temporarily add FUN to `minibuffer-setup-hook' while executing BODY. 1433 "Temporarily add FUN to `minibuffer-setup-hook' while executing BODY.
1434FUN can also be (:append FUN1), in which case FUN1 is appended to 1434
1435`minibuffer-setup-hook'. 1435By default, FUN is prepended to `minibuffer-setup-hook'. But if FUN is of
1436the form `(:append FUN1)', FUN1 will be appended to `minibuffer-setup-hook'
1437instead of prepending it.
1436 1438
1437BODY should use the minibuffer at most once. 1439BODY should use the minibuffer at most once.
1438Recursive uses of the minibuffer are unaffected (FUN is not 1440Recursive uses of the minibuffer are unaffected (FUN is not