diff options
| author | Paul Eggert | 2012-04-09 15:54:59 -0700 |
|---|---|---|
| committer | Paul Eggert | 2012-04-09 15:54:59 -0700 |
| commit | 45e9f7da84c1bd3fc0d36d05c5708ed3b2d3a193 (patch) | |
| tree | 5bc87a8b5a3c754b8eb44a612cc6c03561d6b968 /src/keymap.c | |
| parent | 9d6b4d53469a9ffd67bd770fabc6fe254e35c21d (diff) | |
| parent | 05920a43fc18e696b464387e781e7cfdcea5b5af (diff) | |
| download | emacs-45e9f7da84c1bd3fc0d36d05c5708ed3b2d3a193.tar.gz emacs-45e9f7da84c1bd3fc0d36d05c5708ed3b2d3a193.zip | |
Merge from trunk.
Diffstat (limited to 'src/keymap.c')
| -rw-r--r-- | src/keymap.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/src/keymap.c b/src/keymap.c index 328e6d8ed23..e8f2f88bb26 100644 --- a/src/keymap.c +++ b/src/keymap.c | |||
| @@ -2053,8 +2053,9 @@ static Lisp_Object Qsingle_key_description, Qkey_description; | |||
| 2053 | DEFUN ("key-description", Fkey_description, Skey_description, 1, 2, 0, | 2053 | DEFUN ("key-description", Fkey_description, Skey_description, 1, 2, 0, |
| 2054 | doc: /* Return a pretty description of key-sequence KEYS. | 2054 | doc: /* Return a pretty description of key-sequence KEYS. |
| 2055 | Optional arg PREFIX is the sequence of keys leading up to KEYS. | 2055 | Optional arg PREFIX is the sequence of keys leading up to KEYS. |
| 2056 | Control characters turn into "C-foo" sequences, meta into "M-foo", | 2056 | For example, [?\C-x ?l] is converted into the string \"C-x l\". |
| 2057 | spaces are put between sequence elements, etc. */) | 2057 | |
| 2058 | The `kbd' macro is an approximate inverse of this. */) | ||
| 2058 | (Lisp_Object keys, Lisp_Object prefix) | 2059 | (Lisp_Object keys, Lisp_Object prefix) |
| 2059 | { | 2060 | { |
| 2060 | ptrdiff_t len = 0; | 2061 | ptrdiff_t len = 0; |