Update PostScript version.

[gnu-emacs] / lisp / help.el

diff --git a/lisp/help.el b/lisp/help.el
index 81cea9ab088deebacf94d2e94228e2266c4b24e1..70951e021b90e3baf1478601f10ef99bf817d80b 100644 (file)
--- a/lisp/help.el
+++ b/lisp/help.el
@@ -55,7 +55,6 @@
 (define-key help-map "\C-d" 'describe-distribution)
 (define-key help-map "\C-e" 'view-emacs-problems)
 (define-key help-map "\C-f" 'view-emacs-FAQ)
-(define-key help-map "\C-h" 'view-hello-file)
 (define-key help-map "\C-m" 'view-order-manuals)
 (define-key help-map "\C-n" 'view-emacs-news)
 (define-key help-map "\C-p" 'describe-project)
@@ -191,6 +190,7 @@ e  view-echo-area-messages.  Show the `*Messages*' buffer.
 f  describe-function.  Type a function name and get documentation of it.
 F  Info-goto-emacs-command-node.  Type a function name;
        it takes you to the Info node for that command.
+h  Display the HELLO file which illustrates various scripts.
 i  info. The  info  documentation reader.
 I  describe-input-method.  Describe a specific input method (if you type
        its name) or the current input method (if you type just RET).
@@ -218,21 +218,12 @@ C-c Display Emacs copying permission (GNU General Public License).
 C-d Display Emacs ordering information.
 C-e Display info about Emacs problems.
 C-f Display the Emacs FAQ.
-C-h Display the HELLO file which illustrates various scripts.
 C-m Display how to order printed Emacs manuals.
 C-n Display news of recent Emacs changes.
 C-p Display information about the GNU project.
 C-w Display information on absence of warranty for GNU Emacs."
   help-map)
 
-
-
-(define-key help-map "F" 'Info-goto-emacs-command-node)
-(define-key help-map "K" 'Info-goto-emacs-key-command-node)
-(define-key help-map "I" 'info-lookup-symbol)
-
-
-
 \f
 
 (defun function-called-at-point ()
@@ -271,7 +262,7 @@ If that doesn't give a function, return nil."
 (defun describe-distribution ()
   "Display info on how to obtain the latest version of GNU Emacs."
   (interactive)
-  (view-find (expand-file-name "DISTRIB" data-directory)))
+  (view-file (expand-file-name "DISTRIB" data-directory)))
 
 (defun describe-copying ()
   "Display info on how you may redistribute copies of GNU Emacs."
@@ -421,15 +412,22 @@ If INSERT (the prefix arg) is non-nil, insert the message in the buffer."
      (list (if (equal val "")
               fn (intern val))
           current-prefix-arg)))
-  (let* ((keys (where-is-internal definition overriding-local-map nil nil))
+  (let* ((binding (and (symbolp definition) (commandp definition)
+                      (key-binding definition nil t)))
+        (remap (and (symbolp binding) (commandp binding) binding))
+        (keys (where-is-internal definition overriding-local-map nil nil remap))
         (keys1 (mapconcat 'key-description keys ", "))
         (standard-output (if insert (current-buffer) t)))
     (if insert
        (if (> (length keys1) 0)
-           (princ (format "%s (%s)" keys1 definition))
+           (if remap
+               (princ (format "%s (%s) (remapped from %s)" keys1 remap definition))
+             (princ (format "%s (%s)" keys1 definition)))
          (princ (format "M-x %s RET" definition)))
       (if (> (length keys1) 0)
-         (princ (format "%s is on %s" definition keys1))
+         (if remap
+             (princ (format "%s is remapped to %s which is on %s" definition remap keys1))
+           (princ (format "%s is on %s" definition keys1)))
        (princ (format "%s is not on any key" definition)))))
   nil)