aboutsummaryrefslogtreecommitdiffstats
path: root/src/keymap.h
diff options
context:
space:
mode:
authorPaul Eggert2011-09-10 17:41:48 -0700
committerPaul Eggert2011-09-10 17:41:48 -0700
commit6612f0bffdb752b729a2245bc8beeff1bf6858e3 (patch)
tree140acfb7c4808698a86f160ae6b5e3458160bde5 /src/keymap.h
parente21bac426b787ac0f03c3a64341ec98995ea8262 (diff)
downloademacs-6612f0bffdb752b729a2245bc8beeff1bf6858e3.tar.gz
emacs-6612f0bffdb752b729a2245bc8beeff1bf6858e3.zip
* keymap.h (KEY_DESCRIPTION_SIZE, push_key_description): Move decls
here ... * lisp.h: ... from here. push_key_description is no longer defined in keyboard.c, so its declaration should not be in lisp.h's "Defined in keyboard.c" section, and KEY_DESCRIPTION_SIZE logically belongs with push_key_description.
Diffstat (limited to 'src/keymap.h')
-rw-r--r--src/keymap.h11
1 files changed, 11 insertions, 0 deletions
diff --git a/src/keymap.h b/src/keymap.h
index ec9d4cadbb1..a989f124b14 100644
--- a/src/keymap.h
+++ b/src/keymap.h
@@ -19,6 +19,16 @@ along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>. */
19#ifndef KEYMAP_H 19#ifndef KEYMAP_H
20#define KEYMAP_H 20#define KEYMAP_H
21 21
22/* The maximum byte size consumed by push_key_description.
23 All callers should assure that at least this size of memory is
24 allocated at the place pointed by the second argument.
25
26 There are 6 modifiers, each consumes 2 chars.
27 The octal form of a character code consumes
28 (1 + CHARACTERBITS / 3 + 1) chars (including backslash at the head).
29 We need one more byte for string terminator `\0'. */
30#define KEY_DESCRIPTION_SIZE ((2 * 6) + 1 + (CHARACTERBITS / 3) + 1 + 1)
31
22#define KEYMAPP(m) (!NILP (get_keymap (m, 0, 0))) 32#define KEYMAPP(m) (!NILP (get_keymap (m, 0, 0)))
23extern Lisp_Object Qkeymap, Qmenu_bar; 33extern Lisp_Object Qkeymap, Qmenu_bar;
24extern Lisp_Object Qremap; 34extern Lisp_Object Qremap;
@@ -30,6 +40,7 @@ EXFUN (Fdefine_key, 3);
30EXFUN (Fcommand_remapping, 3); 40EXFUN (Fcommand_remapping, 3);
31EXFUN (Fkey_binding, 4); 41EXFUN (Fkey_binding, 4);
32EXFUN (Fkey_description, 2); 42EXFUN (Fkey_description, 2);
43extern char *push_key_description (EMACS_INT, char *, int);
33EXFUN (Fsingle_key_description, 2); 44EXFUN (Fsingle_key_description, 2);
34EXFUN (Fwhere_is_internal, 5); 45EXFUN (Fwhere_is_internal, 5);
35EXFUN (Fcurrent_active_maps, 2); 46EXFUN (Fcurrent_active_maps, 2);