diff options
| author | Paul Eggert | 2013-01-02 08:13:04 -0800 |
|---|---|---|
| committer | Paul Eggert | 2013-01-02 08:13:04 -0800 |
| commit | 0877d0dc24ee792b9b14592869ea1aa0934aee58 (patch) | |
| tree | 08e9265a1dd95974dc72622a9bef194682c0c716 /src/keymap.c | |
| parent | aca3d51dfa45794fa68a2ffb6269e34fcee2ec6c (diff) | |
| parent | d8fb8cce84b923a3289b69549e30958710ac3ebb (diff) | |
| download | emacs-0877d0dc24ee792b9b14592869ea1aa0934aee58.tar.gz emacs-0877d0dc24ee792b9b14592869ea1aa0934aee58.zip | |
Merge from emacs-24; up to 2012-12-06T01:39:03Z!monnier@iro.umontreal.ca
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 fbdd31e0de3..d1ddd55a358 100644 --- a/src/keymap.c +++ b/src/keymap.c | |||
| @@ -1,5 +1,6 @@ | |||
| 1 | /* Manipulation of keymaps | 1 | /* Manipulation of keymaps |
| 2 | Copyright (C) 1985-1988, 1993-1995, 1998-2012 Free Software Foundation, Inc. | 2 | Copyright (C) 1985-1988, 1993-1995, 1998-2013 Free Software |
| 3 | Foundation, Inc. | ||
| 3 | 4 | ||
| 4 | This file is part of GNU Emacs. | 5 | This file is part of GNU Emacs. |
| 5 | 6 | ||
| @@ -2047,7 +2048,7 @@ DEFUN ("key-description", Fkey_description, Skey_description, 1, 2, 0, | |||
| 2047 | Optional arg PREFIX is the sequence of keys leading up to KEYS. | 2048 | Optional arg PREFIX is the sequence of keys leading up to KEYS. |
| 2048 | For example, [?\C-x ?l] is converted into the string \"C-x l\". | 2049 | For example, [?\C-x ?l] is converted into the string \"C-x l\". |
| 2049 | 2050 | ||
| 2050 | The `kbd' macro is an approximate inverse of this. */) | 2051 | For an approximate inverse of this, see `kbd'. */) |
| 2051 | (Lisp_Object keys, Lisp_Object prefix) | 2052 | (Lisp_Object keys, Lisp_Object prefix) |
| 2052 | { | 2053 | { |
| 2053 | ptrdiff_t len = 0; | 2054 | ptrdiff_t len = 0; |