merge trunk

[gnu-emacs] / lisp / help.el

diff --git a/lisp/help.el b/lisp/help.el
index 9fb993e7173494cde0ffbdcd5d1fd045e66b9c50..899547aa0a17c242c1b8d935d3a70d5e56847204 100644 (file)
--- a/lisp/help.el
+++ b/lisp/help.el
@@ -872,7 +872,9 @@ whose documentation describes the minor mode."
               (insert (format-mode-line mode nil nil buffer))
               (add-text-properties start (point) '(face bold)))))
        (princ " mode:\n")
-       (princ (documentation major-mode))))))
+       (princ (documentation major-mode)))))
+  ;; For the sake of IELM and maybe others
+  nil)
 
 
 (defun describe-minor-mode (minor-mode)
@@ -1046,10 +1048,9 @@ scroll the \"other\" window."
 Select WINDOW according to the value of `help-window-select'.
 Display message telling how to scroll and eventually quit WINDOW.
 
-Optional argument REUSE non-nil means WINDOW has been reused \(by
-`display-buffer'\) for displaying help.  Optional argument
-KEEP-FRAME non-nil means that quitting must no delete the frame
-of WINDOW."
+Optional argument REUSE non-nil means WINDOW has been reused by
+`display-buffer'.  Optional argument KEEP-FRAME non-nil means
+that quitting should not delete WINDOW's frame."
   (let ((number-of-windows
         (length (window-list (window-frame window) 'no-mini window))))
     (cond