X-Git-Url: http://git.chise.org/gitweb/?a=blobdiff_plain;f=lisp%2Fhelp.el;h=abe3bfc7799b51ee906fac371da2635073665da3;hb=f10cfde1e33b549e7cb6773f2785285d6cda4742;hp=5f43c0c8834a0b7beb190c58199fa5d34a1c2f22;hpb=6883ee56ec887c2c48abe5b06b5e66aa74031910;p=chise%2Fxemacs-chise.git

diff --git a/lisp/help.el b/lisp/help.el
index 5f43c0c..abe3bfc 100644
--- a/lisp/help.el
+++ b/lisp/help.el
@@ -461,7 +461,9 @@ You should never set this directory, only let-bind it.")
   (if (and (integerp help-max-help-buffers)
            (> help-max-help-buffers 0)
            (stringp name))
-      (format "*%s: %s*" help-buffer-prefix-string name)
+      (if help-buffer-prefix-string
+	  (format "*%s: %s*" help-buffer-prefix-string name)
+	(format "*%s*" name))
     (format "*%s*" help-buffer-prefix-string)))
 
 ;; Use this function for displaying help when C-h something is pressed
@@ -914,15 +916,11 @@ unless the function is autoloaded."
   :type 'boolean
   :group 'help-appearance)
 
-(defun describe-symbol-find-file (function)
-  (let ((files load-history)
-	file)
-    (while files
-      (if (memq function (cdr (car files)))
-	  (setq file (car (car files))
-		files nil))
-      (setq files (cdr files)))
-    file))
+(defun describe-symbol-find-file (symbol)
+  (loop for (file . load-data) in load-history
+    do (when (memq symbol load-data)
+	 (return file))))
+
 (define-obsolete-function-alias
   'describe-function-find-file
   'describe-symbol-find-file)
@@ -1378,10 +1376,6 @@ after the listing is made.)"
 	       (s (process-status p)))
 	  (setq tail (cdr tail))
 	  (princ (format "%-13s" (process-name p)))
-	  ;;(if (and (eq system-type 'vax-vms)
-	  ;;         (eq s 'signal)
-	  ;;        (< (process-exit-status p) NSIG))
-	  ;;    (princ (aref sys_errlist (process-exit-status p))))
 	  (princ s)
 	  (if (and (eq s 'exit) (/= (process-exit-status p) 0))
 	      (princ (format " %d" (process-exit-status p))))
@@ -1416,4 +1410,25 @@ after the listing is made.)"
 		(if cmd (princ " ")))))
 	  (terpri))))))
 
+;; Stop gap for 21.0 untill we do help-char etc properly.
+(defun help-keymap-with-help-key (keymap form)
+  "Return a copy of KEYMAP with an help-key binding according to help-char
+ invoking FORM like help-form.  An existing binding is not overridden.
+ If FORM is nil then no binding is made."
+  (let ((map (copy-keymap keymap))
+	(key (if (characterp help-char)
+		 (vector (character-to-event help-char))
+	       help-char)))
+    (when (and form key (not (lookup-key map key)))
+      (define-key map key
+	`(lambda () (interactive) (help-print-help-form ,form))))
+    map))
+
+(defun help-print-help-form (form)
+  (let ((string (eval form)))
+    (if (stringp string)
+	(with-displaying-help-buffer
+	 (insert string)))))
+
+
 ;;; help.el ends here