diff options
| author | Chong Yidong <cyd@gnu.org> | 2012-02-26 17:24:13 +0800 |
|---|---|---|
| committer | Chong Yidong <cyd@gnu.org> | 2012-02-26 17:24:13 +0800 |
| commit | 07498861aec0eb2103820342747350736419444d (patch) | |
| tree | 30775180b868f09ab07e9ad146115f64c0480679 | |
| parent | ad7c802c9c0fbc0609f822e17481439ecf3c0332 (diff) | |
| download | emacs-07498861aec0eb2103820342747350736419444d.tar.gz | |
* help-fns.el (describe-function-1): Clarify description of remapping.
Fixes: debbugs:10844
| -rw-r--r-- | lisp/ChangeLog | 3 | ||||
| -rw-r--r-- | lisp/help-fns.el | 8 |
2 files changed, 8 insertions, 3 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 418be2539b6..9f1c4e71444 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,5 +1,8 @@ 2012-02-26 Chong Yidong <cyd@gnu.org> + * help-fns.el (describe-function-1): Clarify description of + remapping (Bug#10844). + * files.el (files-equal-p): Doc fix. (file-subdir-of-p): Doc fix. Convert loop macro to plain Lisp, and quit the loop once a mismatch is found. diff --git a/lisp/help-fns.el b/lisp/help-fns.el index 0175ffa4d9a..ed52be6cc1e 100644 --- a/lisp/help-fns.el +++ b/lisp/help-fns.el @@ -482,12 +482,14 @@ suitable file is found, return nil." (if (member (event-modifiers (aref key 0)) '(nil (shift))) (push key non-modified-keys))) (when remapped - (princ "It is remapped to `") + (princ "Its keys are remapped to `") (princ (symbol-name remapped)) - (princ "'")) + (princ "'.\n")) (when keys - (princ (if remapped ", which is bound to " "It is bound to ")) + (princ (if remapped + "Without this remapping, it would be bound to " + "It is bound to ")) ;; If lots of ordinary text characters run this command, ;; don't mention them one by one. (if (< (length non-modified-keys) 10) |