Merge from emacs--devo--0

[gnu-emacs] / lisp / descr-text.el

diff --git a/lisp/descr-text.el b/lisp/descr-text.el
index c1bdfeb55a8471fb91bf091d4a1c2fa91ff680a7..18c4144c5f47c20e05f7377d056add05b93d5d93 100644 (file)
--- a/lisp/descr-text.el
+++ b/lisp/descr-text.el
@@ -512,7 +512,7 @@ as well as widgets, buttons, overlays, and text properties."
                                             (if (cadr x) (length (car x)) 0))
                                         item-list)))
     (help-setup-xref nil (interactive-p))
-    (with-output-to-temp-buffer (help-buffer)
+    (with-help-window (help-buffer)
       (with-current-buffer standard-output
        (set-buffer-multibyte multibyte-p)
        (let ((formatter (format "%%%ds:" max-width)))
@@ -631,8 +631,7 @@ as well as widgets, buttons, overlays, and text properties."
 
         (if text-props-desc (insert text-props-desc))
        (setq help-xref-stack-item (list 'help-insert-string (buffer-string)))
-       (toggle-read-only 1)
-       (print-help-return-message)))))
+       (toggle-read-only 1)))))
 
 (defalias 'describe-char-after 'describe-char)
 (make-obsolete 'describe-char-after 'describe-char "22.1")