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

[Juanma Barranquero]

Index: emacs/lisp/help.el
diff -c emacs/lisp/help.el:1.252 emacs/lisp/help.el:1.253
*** emacs/lisp/help.el:1.252    Tue Jul 16 12:08:44 2002
--- emacs/lisp/help.el  Thu Nov  7 11:45:46 2002
***************
*** 420,440 ****
       (list (if (equal val "")
               fn (intern val))
           current-prefix-arg)))
!   (let* ((remapped (remap-command definition))
!        (keys (where-is-internal definition overriding-local-map nil nil 
remapped))
!        (keys1 (mapconcat 'key-description keys ", "))
!        (standard-output (if insert (current-buffer) t)))
!     (if insert
!       (if (> (length keys1) 0)
!           (if remapped
!               (princ (format "%s (%s) (remapped from %s)" keys1 remapped 
definition))
!             (princ (format "%s (%s)" keys1 definition)))
!         (princ (format "M-x %s RET" definition)))
!       (if (> (length keys1) 0)
!         (if remapped
!             (princ (format "%s is remapped to %s which is on %s" definition 
remapped keys1))
!           (princ (format "%s is on %s" definition keys1)))
!       (princ (format "%s is not on any key" definition)))))
    nil)
  
  (defun string-key-binding (key)
--- 420,457 ----
       (list (if (equal val "")
               fn (intern val))
           current-prefix-arg)))
!   (let ((func (indirect-function definition))
!         (map nil)
!         (standard-output (if insert (current-buffer) t)))
!     (mapatoms #'(lambda (symbol)
!                   (when (and (not (eq symbol definition))
!                              (fboundp symbol)
!                              (eq func (indirect-function symbol)))
!                     (setq map (cons symbol map)))))
!     (princ (mapconcat
!             #'(lambda (symbol)
!                 (let* ((remapped (remap-command symbol))
!                        (keys (mapconcat 'key-description
!                                         (where-is-internal symbol
!                                                            
overriding-local-map
!                                                            nil nil
!                                                            remapped)
!                                         ", ")))
!                   (if insert
!                       (if (> (length keys) 0)
!                           (if remapped
!                               (format "%s (%s) (remapped from %s)"
!                                       keys remapped symbol)
!                             (format "%s (%s)" keys symbol))
!                         (format "M-x %s RET" symbol))
!                     (if (> (length keys) 0)
!                         (if remapped
!                             (format "%s is remapped to %s which is on %s"
!                                     definition symbol keys)
!                           (format "%s is on %s" symbol keys))
!                       (format "%s is not on any key" symbol)))))
!             (cons definition map)
!             ";\nand ")))
    nil)
  
  (defun string-key-binding (key)