diff options
| author | Lute Kamstra | 2005-04-13 09:16:02 +0000 |
|---|---|---|
| committer | Lute Kamstra | 2005-04-13 09:16:02 +0000 |
| commit | 59d922a4da1890ff5e773b1c0e0a8d3f310a4bdf (patch) | |
| tree | 376cd95dc0596738eeab7945a6158ccfd5c59bf2 | |
| parent | 9aade6c6f258cf40faaf0c2e7a50adb649c98a70 (diff) | |
| download | emacs-59d922a4da1890ff5e773b1c0e0a8d3f310a4bdf.tar.gz emacs-59d922a4da1890ff5e773b1c0e0a8d3f310a4bdf.zip | |
(describe-key-briefly): UNTRANSLATED can be nil when called from lisp.
| -rw-r--r-- | lisp/help.el | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/lisp/help.el b/lisp/help.el index a3e14014b79..e65982623c1 100644 --- a/lisp/help.el +++ b/lisp/help.el | |||
| @@ -590,7 +590,8 @@ the last key hit are used." | |||
| 590 | ;; Don't bother user with strings from (e.g.) the select-paste menu. | 590 | ;; Don't bother user with strings from (e.g.) the select-paste menu. |
| 591 | (if (stringp (aref key (1- (length key)))) | 591 | (if (stringp (aref key (1- (length key)))) |
| 592 | (aset key (1- (length key)) "(any string)")) | 592 | (aset key (1- (length key)) "(any string)")) |
| 593 | (if (stringp (aref untranslated (1- (length untranslated)))) | 593 | (if (and (> (length untranslated) 0) |
| 594 | (stringp (aref untranslated (1- (length untranslated))))) | ||
| 594 | (aset untranslated (1- (length untranslated)) | 595 | (aset untranslated (1- (length untranslated)) |
| 595 | "(any string)")) | 596 | "(any string)")) |
| 596 | ;; Now describe the key, perhaps as changed. | 597 | ;; Now describe the key, perhaps as changed. |
| @@ -603,7 +604,6 @@ the last key hit are used." | |||
| 603 | key-desc | 604 | key-desc |
| 604 | (if (symbolp defn) defn (prin1-to-string defn))))))))) | 605 | (if (symbolp defn) defn (prin1-to-string defn))))))))) |
| 605 | 606 | ||
| 606 | |||
| 607 | (defun describe-key (key &optional untranslated up-event) | 607 | (defun describe-key (key &optional untranslated up-event) |
| 608 | "Display documentation of the function invoked by KEY. | 608 | "Display documentation of the function invoked by KEY. |
| 609 | KEY should be a key sequence--when calling from a program, | 609 | KEY should be a key sequence--when calling from a program, |