(describe-mode): Make minor mode list more concise.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 09c891c..3f94298 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,7 @@
+2006-08-06  Richard Stallman  <rms@gnu.org>
+
+       * help.el (describe-mode): Make minor mode list more concise.
+
 2006-08-05  Chong Yidong  <cyd@stupidchicken.com>
 
        * bindings.el: Give mode-line-format, mode-line-modes, and

diff --git a/lisp/help.el b/lisp/help.el
index 4d92f69..af79bbc 100644 (file)
--- a/lisp/help.el
+++ b/lisp/help.el
@@ -822,16 +822,13 @@ whose documentation describes the minor mode."
              (sort minor-modes
                    (lambda (a b) (string-lessp (cadr a) (cadr b)))))
        (when minor-modes
-         (princ "Summary of minor modes:\n")
+         (princ "Enabled minor modes:\n")
          (make-local-variable 'help-button-cache)
          (with-current-buffer standard-output
            (dolist (mode minor-modes)
              (let ((mode-function (nth 0 mode))
                    (pretty-minor-mode (nth 1 mode))
                    (indicator (nth 2 mode)))
-               (setq indicator (if (zerop (length indicator))
-                                   "no indicator"
-                                 (format "indicator%s" indicator)))
                (add-text-properties 0 (length pretty-minor-mode)
                                     '(face bold) pretty-minor-mode)
                (save-excursion
@@ -840,16 +837,22 @@ whose documentation describes the minor mode."
                  (push (point-marker) help-button-cache)
                  ;; Document the minor modes fully.
                  (insert pretty-minor-mode)
-                 (princ (format " minor mode (%s):\n" indicator))
+                 (princ (format " minor mode (%s):\n"
+                                (if (zerop (length indicator))
+                                    "no indicator"
+                                  (format "indicator%s"
+                                  indicator))))
                  (princ (documentation mode-function)))
-               (princ "  ")
                (insert-button pretty-minor-mode
                               'action (car help-button-cache)
                               'follow-link t
                               'help-echo "mouse-2, RET: show full information")
-               (princ (format " minor mode (%s):\n" indicator)))))
-         (princ "\n(Full information about these minor modes
-follows the description of the major mode.)\n\n"))
+               (newline)))
+           (forward-line -1)
+           (fill-paragraph nil)
+           (forward-line 1))
+
+         (princ "\n(Information about these minor modes follows the major mode info.)\n\n"))
        ;; Document the major mode.
        (let ((mode mode-name))
          (with-current-buffer standard-output