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

[Richard M . Stallman]

Index: emacs/lisp/help.el
diff -c emacs/lisp/help.el:1.278 emacs/lisp/help.el:1.279
*** emacs/lisp/help.el:1.278    Mon Mar 21 17:41:41 2005
--- emacs/lisp/help.el  Sun Apr 10 01:47:43 2005
***************
*** 586,592 ****
        ;; Ok, now look up the key and name the command.
        (let ((defn (or (string-key-binding key)
                      (key-binding key)))
!           (key-desc (help-key-description key untranslated)))
        (if (or (null defn) (integerp defn) (equal defn 'undefined))
            (princ (format "%s is undefined" key-desc))
          (princ (format (if (windowp window)
--- 586,600 ----
        ;; Ok, now look up the key and name the command.
        (let ((defn (or (string-key-binding key)
                      (key-binding key)))
!           key-desc)
!       ;; Don't bother user with strings from (e.g.) the select-paste menu.
!       (if (stringp (aref key (1- (length key))))
!           (aset key (1- (length key)) "(any string)"))
!       (if (stringp (aref untranslated (1- (length untranslated))))
!           (aset untranslated (1- (length untranslated))
!                 "(any string)"))
!       ;; Now describe the key, perhaps as changed.
!       (setq key-desc (help-key-description key untranslated))
        (if (or (null defn) (integerp defn) (equal defn 'undefined))
            (princ (format "%s is undefined" key-desc))
          (princ (format (if (windowp window)
***************
*** 623,628 ****
--- 631,642 ----
        (if (or (null defn) (integerp defn) (equal defn 'undefined))
            (message "%s is undefined" (help-key-description key untranslated))
          (help-setup-xref (list #'describe-function defn) (interactive-p))
+         ;; Don't bother user with strings from (e.g.) the select-paste menu.
+         (if (stringp (aref key (1- (length key))))
+             (aset key (1- (length key)) "(any string)"))
+         (if (stringp (aref untranslated (1- (length untranslated))))
+             (aset untranslated (1- (length untranslated))
+                   "(any string)"))
          (with-output-to-temp-buffer (help-buffer)
            (princ (help-key-description key untranslated))
            (if (windowp window)