Rename `chinese-cns11643-6' to `=cns11643-6'.

[chise/xemacs-chise.git.1] / lisp / help.el

diff --git a/lisp/help.el b/lisp/help.el
index cb09d8a..1835b7d 100644 (file)
--- a/lisp/help.el
+++ b/lisp/help.el
@@ -433,11 +433,7 @@ You should never set this directory, only let-bind it.")
        (format "*%s*" name))
     (format "*%s*" help-buffer-prefix-string)))
 
-;; Use this function for displaying help when C-h something is pressed
-;; or in similar situations.  Do *not* use it when you are displaying
-;; a help message and then prompting for input in the minibuffer --
-;; this macro usually selects the help buffer, which is not what you
-;; want in those situations.
+;; with-displaying-help-buffer
 
 ;; #### Should really be a macro to eliminate the requirement of
 ;; caller to code a lambda form in THUNK -- mrb
@@ -464,7 +460,13 @@ You should never set this directory, only let-bind it.")
 
 (defun with-displaying-help-buffer (thunk &optional name)
   "Form which makes a help buffer with given NAME and evaluates BODY there.
-The actual name of the buffer is generated by the function `help-buffer-name'."
+The actual name of the buffer is generated by the function `help-buffer-name'.
+
+Use this function for displaying help when C-h something is pressed or
+in similar situations.  Do *not* use it when you are displaying a help
+message and then prompting for input in the minibuffer -- this macro
+usually selects the help buffer, which is not what you want in those
+situations."
   (let* ((winconfig (current-window-configuration))
         (was-one-window (one-window-p))
         (buffer-name (help-buffer-name name))
@@ -579,8 +581,11 @@ describes the minor mode."
                   (setq indicator (cdr indicator)))
                 (while (and indicator (symbolp indicator))
                   (setq indicator (symbol-value indicator)))
-                (princ (format "%s minor mode (indicator%s):\n"
-                               pretty-minor-mode indicator))
+                (princ (format "%s minor mode (%s):\n"
+                               pretty-minor-mode
+                               (if indicator
+                                   (format "indicator%s" indicator)
+                                 "no indicator")))
                 (princ (documentation minor-mode))
                 (princ "\n\n----\n\n"))))
         (setq minor-modes (cdr minor-modes)))))