diff options
| author | Stephen Berman <stephen.berman@gmx.net> | 2017-02-08 22:38:39 +0100 |
|---|---|---|
| committer | Stephen Berman <stephen.berman@gmx.net> | 2017-02-08 22:38:39 +0100 |
| commit | 90f76eb3584ef1fda727bcd0dd74c5324a11a59d (patch) | |
| tree | 720ea3aac10d3af9688d163cffee5e35192888a9 /lisp | |
| parent | e3b659630843de7e459bce483c278af765c644f7 (diff) | |
| download | emacs-90f76eb3584ef1fda727bcd0dd74c5324a11a59d.tar.gz emacs-90f76eb3584ef1fda727bcd0dd74c5324a11a59d.tar.bz2 emacs-90f76eb3584ef1fda727bcd0dd74c5324a11a59d.zip | |
describe-char: unambiguous name for inserting ASCII 7
* lisp/descr-text.el (describe-char): Make the input
suggestion for inserting ASCII character 7 by name use the
unambiguous name "BELL (BEL)" (bug#25641).
Diffstat (limited to 'lisp')
| -rw-r--r-- | lisp/descr-text.el | 16 |
1 files changed, 12 insertions, 4 deletions
diff --git a/lisp/descr-text.el b/lisp/descr-text.el index 3971dbb86b2..6a6a8ea4479 100644 --- a/lisp/descr-text.el +++ b/lisp/descr-text.el @@ -616,10 +616,18 @@ relevant to POS." 'help-args '(,current-input-method)) "input method") (list - (let ((name - (or (get-char-code-property char 'name) - (get-char-code-property char 'old-name)))) - (if (and name (assoc-string name (ucs-names))) + (let* ((names (ucs-names)) + (name + (or (when (= char 7) + ;; Special case for "BELL" which is + ;; apparently the only char which + ;; doesn't have a new name and whose + ;; old-name is shadowed by a newer char + ;; with that name (bug#25641). + (car (rassoc char names))) + (get-char-code-property char 'name) + (get-char-code-property char 'old-name)))) + (if (and name (assoc-string name names)) (format "type \"C-x 8 RET %x\" or \"C-x 8 RET %s\"" char name) |