diff options
| author | Christopher Schmidt | 2012-08-22 00:02:15 -0700 |
|---|---|---|
| committer | Glenn Morris | 2012-08-22 00:02:15 -0700 |
| commit | 80a51fa01ff36879aa57f82f90b796a2092e8191 (patch) | |
| tree | 2a4f7b4b6ffffbf5ee06511d322b1234d49ad82e | |
| parent | fbb6300b6d0058c464631da982af1a77ff798524 (diff) | |
| download | emacs-80a51fa01ff36879aa57f82f90b796a2092e8191.tar.gz emacs-80a51fa01ff36879aa57f82f90b796a2092e8191.zip | |
* help-fns.el (help-fns--key-bindings): Abbreviate non-symbol remap targets.
Fixes: debbugs:12174
| -rw-r--r-- | lisp/ChangeLog | 5 | ||||
| -rw-r--r-- | lisp/help-fns.el | 8 |
2 files changed, 10 insertions, 3 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 688b6a9e341..db15ad80927 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog | |||
| @@ -1,3 +1,8 @@ | |||
| 1 | 2012-08-22 Christopher Schmidt <christopher@ch.ristopher.com> | ||
| 2 | |||
| 3 | * help-fns.el (help-fns--key-bindings): | ||
| 4 | Abbreviate non-symbol remap targets. (Bug#12174) | ||
| 5 | |||
| 1 | 2012-08-22 Martin Rudalics <rudalics@gmx.at> | 6 | 2012-08-22 Martin Rudalics <rudalics@gmx.at> |
| 2 | 7 | ||
| 3 | * dired.el (dired-mark-remembered): Don't clobber point. | 8 | * dired.el (dired-mark-remembered): Don't clobber point. |
diff --git a/lisp/help-fns.el b/lisp/help-fns.el index 4b1480444c2..5791f1225c1 100644 --- a/lisp/help-fns.el +++ b/lisp/help-fns.el | |||
| @@ -397,9 +397,11 @@ suitable file is found, return nil." | |||
| 397 | (if (member (event-modifiers (aref key 0)) '(nil (shift))) | 397 | (if (member (event-modifiers (aref key 0)) '(nil (shift))) |
| 398 | (push key non-modified-keys))) | 398 | (push key non-modified-keys))) |
| 399 | (when remapped | 399 | (when remapped |
| 400 | (princ "Its keys are remapped to `") | 400 | (princ "Its keys are remapped to ") |
| 401 | (princ (symbol-name remapped)) | 401 | (princ (if (symbolp remapped) |
| 402 | (princ "'.\n")) | 402 | (concat "`" (symbol-name remapped) "'") |
| 403 | "an anonymous command")) | ||
| 404 | (princ ".\n")) | ||
| 403 | 405 | ||
| 404 | (when keys | 406 | (when keys |
| 405 | (princ (if remapped | 407 | (princ (if remapped |