/[emacs]/emacs/lisp/help.el
ViewVC logotype

Diff of /emacs/lisp/help.el

Parent Directory Parent Directory | Revision Log Revision Log | View Patch Patch

revision 1.278 by rms, Mon Mar 21 17:41:41 2005 UTC revision 1.279 by rms, Sun Apr 10 01:47:43 2005 UTC
# Line 586  the last key hit are used." Line 586  the last key hit are used."
586        ;; Ok, now look up the key and name the command.        ;; Ok, now look up the key and name the command.
587        (let ((defn (or (string-key-binding key)        (let ((defn (or (string-key-binding key)
588                        (key-binding key)))                        (key-binding key)))
589              (key-desc (help-key-description key untranslated)))              key-desc)
590            ;; Don't bother user with strings from (e.g.) the select-paste menu.
591            (if (stringp (aref key (1- (length key))))
592                (aset key (1- (length key)) "(any string)"))
593            (if (stringp (aref untranslated (1- (length untranslated))))
594                (aset untranslated (1- (length untranslated))
595                      "(any string)"))
596            ;; Now describe the key, perhaps as changed.
597            (setq key-desc (help-key-description key untranslated))
598          (if (or (null defn) (integerp defn) (equal defn 'undefined))          (if (or (null defn) (integerp defn) (equal defn 'undefined))
599              (princ (format "%s is undefined" key-desc))              (princ (format "%s is undefined" key-desc))
600            (princ (format (if (windowp window)            (princ (format (if (windowp window)
# Line 623  the last key hit are used." Line 631  the last key hit are used."
631          (if (or (null defn) (integerp defn) (equal defn 'undefined))          (if (or (null defn) (integerp defn) (equal defn 'undefined))
632              (message "%s is undefined" (help-key-description key untranslated))              (message "%s is undefined" (help-key-description key untranslated))
633            (help-setup-xref (list #'describe-function defn) (interactive-p))            (help-setup-xref (list #'describe-function defn) (interactive-p))
634              ;; Don't bother user with strings from (e.g.) the select-paste menu.
635              (if (stringp (aref key (1- (length key))))
636                  (aset key (1- (length key)) "(any string)"))
637              (if (stringp (aref untranslated (1- (length untranslated))))
638                  (aset untranslated (1- (length untranslated))
639                        "(any string)"))
640            (with-output-to-temp-buffer (help-buffer)            (with-output-to-temp-buffer (help-buffer)
641              (princ (help-key-description key untranslated))              (princ (help-key-description key untranslated))
642              (if (windowp window)              (if (windowp window)

Legend:
Removed from v.1.278  
changed lines
  Added in v.1.279

savannah-hackers-public@gnu.org
ViewVC Help
Powered by ViewVC 1.1.26