summaryrefslogtreecommitdiff
path: root/lisp/help.el
diff options
context:
space:
mode:
authorMartin Rudalics <rudalics@gmx.at>2014-02-28 10:10:55 +0100
committerMartin Rudalics <rudalics@gmx.at>2014-02-28 10:10:55 +0100
commit9dda75adcd4e7e3961349e52a9e82c66dda968d6 (patch)
treed2cb93f337a6e0ca091bb9f3533c027b4766e844 /lisp/help.el
parent8a73034ea9b80b2badfdcd5e473fddec8bc0ec6a (diff)
downloademacs-9dda75adcd4e7e3961349e52a9e82c66dda968d6.tar.gz
Revert recent with-temp-buffer-window change (Bug#16816, Bug#16882).
* window.el (with-temp-buffer-window): Revert change from 2014-02-21. Suggested by Thierry Volpiatto <thierry.volpiatto@gmail.com>. Fix doc-string based on a suggestion by Nicolas Richard <theonewiththeevillook@yahoo.fr>. * help.el (with-help-window): Fix doc-string.
Diffstat (limited to 'lisp/help.el')
-rw-r--r--lisp/help.el11
1 files changed, 8 insertions, 3 deletions
diff --git a/lisp/help.el b/lisp/help.el
index f00accc370c..1e3d41eb88a 100644
--- a/lisp/help.el
+++ b/lisp/help.el
@@ -1194,9 +1194,14 @@ Return VALUE."
;; Note: It's usually always wrong to use `help-print-return-message' in
;; the body of `with-help-window'.
(defmacro with-help-window (buffer-name &rest body)
- "Display buffer with name BUFFER-NAME in a help window evaluating BODY.
-Select help window if the current value of the user option
-`help-window-select' says so. Return last value in BODY."
+ "Display buffer with name BUFFER-NAME in a help window.
+Evaluate the forms in BODY with the buffer specified by
+BUFFER-NAME current, put that buffer in `help-mode', display the
+buffer in a window (see `with-temp-buffer-window' for details)
+and issue a message how to deal with that \"help\" window when
+it's no more needed. Select the help window if the current value
+of the user option `help-window-select' says so. Return last
+value in BODY."
(declare (indent 1) (debug t))
`(progn
;; Make `help-window-point-marker' point nowhere. The only place