# HG changeset patch
# User Martin Rudalics <rudalics@gmx.at>
# Date 1194688715 0
# Node ID 494608f8dd2417fd23ebda01e9d6394450bd2e5a
# Parent  474f44ceee974023cbdd642615419b1416d7970e
(describe-function, describe-variable)
(describe-syntax, describe-categories):
Use with-help-window instead of with-output-to-temp-buffer.

diff -r 474f44ceee97 -r 494608f8dd24 lisp/help-fns.el
--- a/lisp/help-fns.el	Sat Nov 10 09:57:52 2007 +0000
+++ b/lisp/help-fns.el	Sat Nov 10 09:58:35 2007 +0000
@@ -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 @@
 		    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 @@
 		  (terpri)
 		  (princ output))))
 
-	    (print-help-return-message)
 	    (save-excursion
 	      (set-buffer standard-output)
 	      ;; Return the text we displayed.
@@ -700,7 +698,7 @@
   (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 @@
   (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)