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

[Miles Bader]

Index: emacs/lisp/help.el
diff -c emacs/lisp/help.el:1.250.2.9 emacs/lisp/help.el:1.250.2.10
*** emacs/lisp/help.el:1.250.2.9        Mon Oct 25 04:22:22 2004
--- emacs/lisp/help.el  Fri Oct 29 02:05:08 2004
***************
*** 573,586 ****
                         (if (symbolp defn) defn (prin1-to-string defn)))))))))
  
  
! (defun describe-key (key &optional untranslated)
    "Display documentation of the function invoked by KEY.
  KEY should be a key sequence--when calling from a program,
  pass a string or a vector.
  If non-nil UNTRANSLATED is a vector of the untranslated events.
  It can also be a number in which case the untranslated events from
  the last key hit are used."
!   (interactive "kDescribe key: \np")
    (if (numberp untranslated)
        (setq untranslated (this-single-command-raw-keys)))
    (save-excursion
--- 573,586 ----
                         (if (symbolp defn) defn (prin1-to-string defn)))))))))
  
  
! (defun describe-key (key &optional untranslated up-event)
    "Display documentation of the function invoked by KEY.
  KEY should be a key sequence--when calling from a program,
  pass a string or a vector.
  If non-nil UNTRANSLATED is a vector of the untranslated events.
  It can also be a number in which case the untranslated events from
  the last key hit are used."
!   (interactive "kDescribe key: \np\nU")
    (if (numberp untranslated)
        (setq untranslated (this-single-command-raw-keys)))
    (save-excursion
***************
*** 608,613 ****
--- 608,624 ----
            (prin1 defn)
            (princ "\n   which is ")
            (describe-function-1 defn)
+           (when up-event
+             (let ((defn (or (string-key-binding up-event) (key-binding 
up-event))))
+               (unless (or (null defn) (integerp defn) (equal defn 'undefined))
+                 (princ "\n\n-------------- up event ---------------\n\n")
+                 (princ (key-description up-event))
+                 (if (windowp window)
+                     (princ " at that spot"))
+                 (princ " runs the command ")
+                 (prin1 defn)
+                 (princ "\n   which is ")
+                 (describe-function-1 defn))))
            (print-help-return-message)))))))