X-Git-Url: http://git.chise.org/gitweb/?a=blobdiff_plain;f=lisp%2Fhelp.el;h=1835b7d2345aa50ed5c62ca9b6bc48e1256796df;hb=90e5840e6e089cdf249e54277fcb8179105bba2b;hp=a7642340b519ff0eadff4fc7897a3ecc5763b779;hpb=efdb31fd4c8db81d2414c32d491f1bf994263c74;p=chise%2Fxemacs-chise.git

diff --git a/lisp/help.el b/lisp/help.el
index a764234..1835b7d 100644
--- 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)))))
@@ -1183,6 +1188,7 @@ part of the documentation of internal subroutines."
 			 (documentation sym t))))
 	  (when (or var fun)
 	    (let ((ex (make-extent b e)))
+	      (require 'hyper-apropos)
 	      (set-extent-property ex 'mouse-face 'highlight)
 	      (set-extent-property ex 'help-symbol sym)
 	      (set-extent-property ex 'face 'hyper-apropos-hyperlink)