diff options
| author | Chong Yidong | 2012-03-12 01:08:10 +0800 |
|---|---|---|
| committer | Chong Yidong | 2012-03-12 01:08:10 +0800 |
| commit | 413df973020798154647c0de054cb6a423d2f656 (patch) | |
| tree | c447e6db89545ce7f6480d6f4502ac6ced6d5bf6 /src | |
| parent | 397a688f21317fbbd59a820fc20cccbad8cf89fd (diff) | |
| download | emacs-413df973020798154647c0de054cb6a423d2f656.tar.gz emacs-413df973020798154647c0de054cb6a423d2f656.zip | |
* keymap.c (Fkey_description): Doc fix.
Fixes: debbugs:9700
Diffstat (limited to 'src')
| -rw-r--r-- | src/ChangeLog | 2 | ||||
| -rw-r--r-- | src/keymap.c | 5 |
2 files changed, 5 insertions, 2 deletions
diff --git a/src/ChangeLog b/src/ChangeLog index 8d925c7bbad..0bcbf4e269a 100644 --- a/src/ChangeLog +++ b/src/ChangeLog | |||
| @@ -1,5 +1,7 @@ | |||
| 1 | 2012-03-11 Chong Yidong <cyd@gnu.org> | 1 | 2012-03-11 Chong Yidong <cyd@gnu.org> |
| 2 | 2 | ||
| 3 | * keymap.c (Fkey_description): Doc fix (Bug#9700). | ||
| 4 | |||
| 3 | * editfns.c (Fconstrain_to_field): Doc fix (Bug#9452). | 5 | * editfns.c (Fconstrain_to_field): Doc fix (Bug#9452). |
| 4 | 6 | ||
| 5 | 2012-03-10 Chong Yidong <cyd@gnu.org> | 7 | 2012-03-10 Chong Yidong <cyd@gnu.org> |
diff --git a/src/keymap.c b/src/keymap.c index 0ae055213c3..ecaeb32896e 100644 --- a/src/keymap.c +++ b/src/keymap.c | |||
| @@ -2043,8 +2043,9 @@ static Lisp_Object Qsingle_key_description, Qkey_description; | |||
| 2043 | DEFUN ("key-description", Fkey_description, Skey_description, 1, 2, 0, | 2043 | DEFUN ("key-description", Fkey_description, Skey_description, 1, 2, 0, |
| 2044 | doc: /* Return a pretty description of key-sequence KEYS. | 2044 | doc: /* Return a pretty description of key-sequence KEYS. |
| 2045 | Optional arg PREFIX is the sequence of keys leading up to KEYS. | 2045 | Optional arg PREFIX is the sequence of keys leading up to KEYS. |
| 2046 | Control characters turn into "C-foo" sequences, meta into "M-foo", | 2046 | For example, [?\C-x ?l] is converted into the string \"C-x l\". |
| 2047 | spaces are put between sequence elements, etc. */) | 2047 | |
| 2048 | The `kbd' macro is an approximate inverse of this. */) | ||
| 2048 | (Lisp_Object keys, Lisp_Object prefix) | 2049 | (Lisp_Object keys, Lisp_Object prefix) |
| 2049 | { | 2050 | { |
| 2050 | int len = 0; | 2051 | int len = 0; |