(describe-function, describe-variable)

(describe-syntax, describe-categories):
Use with-help-window instead of with-output-to-temp-buffer.
This commit is contained in:
Martin Rudalics 2007-11-10 09:59:54 +00:00
parent 4644fd351f
commit aa13a09404
2 changed files with 44 additions and 6 deletions

View file

@ -55,13 +55,12 @@
(message "You didn't specify a function")
(help-setup-xref (list #'describe-function function) (interactive-p))
(save-excursion
(with-output-to-temp-buffer (help-buffer)
(with-help-window (help-buffer)
(prin1 function)
;; Use " is " instead of a colon so that
;; it is easier to get out the function name using forward-sexp.
(princ " is ")
(describe-function-1 function)
(print-help-return-message)
(with-current-buffer standard-output
;; Return the text we displayed.
(buffer-string))))))
@ -517,7 +516,7 @@ it is displayed along with the global value."
locus (variable-binding-locus variable)))))
(help-setup-xref (list #'describe-variable variable buffer)
(interactive-p))
(with-output-to-temp-buffer (help-buffer)
(with-help-window (help-buffer)
(with-current-buffer buffer
(prin1 variable)
;; Make a hyperlink to the library if appropriate. (Don't
@ -685,7 +684,6 @@ it is displayed along with the global value."
(terpri)
(princ output))))
(print-help-return-message)
(save-excursion
(set-buffer standard-output)
;; Return the text we displayed.
@ -700,7 +698,7 @@ BUFFER defaults to the current buffer."
(interactive)
(setq buffer (or buffer (current-buffer)))
(help-setup-xref (list #'describe-syntax buffer) (interactive-p))
(with-output-to-temp-buffer (help-buffer)
(with-help-window (help-buffer)
(let ((table (with-current-buffer buffer (syntax-table))))
(with-current-buffer standard-output
(describe-vector table 'internal-describe-syntax-value)
@ -725,7 +723,7 @@ BUFFER should be a buffer or a buffer name."
(interactive)
(setq buffer (or buffer (current-buffer)))
(help-setup-xref (list #'describe-categories buffer) (interactive-p))
(with-output-to-temp-buffer (help-buffer)
(with-help-window (help-buffer)
(let ((table (with-current-buffer buffer (category-table))))
(with-current-buffer standard-output
(describe-vector table 'help-describe-category-set)