[Emacs-diffs] Changes to emacs/lisp/help.el

[Kim F. Storm]

Index: emacs/lisp/help.el
diff -c emacs/lisp/help.el:1.243 emacs/lisp/help.el:1.244
*** emacs/lisp/help.el:1.243    Wed Jan 16 20:40:47 2002
--- emacs/lisp/help.el  Wed Feb  6 18:03:56 2002
***************
*** 412,426 ****
       (list (if (equal val "")
               fn (intern val))
           current-prefix-arg)))
!   (let* ((keys (where-is-internal definition overriding-local-map nil nil))
         (keys1 (mapconcat 'key-description keys ", "))
         (standard-output (if insert (current-buffer) t)))
      (if insert
        (if (> (length keys1) 0)
!           (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))
        (princ (format "%s is not on any key" definition)))))
    nil)
  
--- 412,433 ----
       (list (if (equal val "")
               fn (intern val))
           current-prefix-arg)))
!   (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)
!           (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)
!         (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)