diff options
| -rw-r--r-- | src/ChangeLog | 9 | ||||
| -rw-r--r-- | src/keymap.h | 11 | ||||
| -rw-r--r-- | src/lisp.h | 12 |
3 files changed, 20 insertions, 12 deletions
diff --git a/src/ChangeLog b/src/ChangeLog index f7e029271e0..da0576fdb46 100644 --- a/src/ChangeLog +++ b/src/ChangeLog @@ -1,3 +1,12 @@ +2011-09-11 Paul Eggert <eggert@cs.ucla.edu> + + * 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. + 2011-09-10 Paul Eggert <eggert@cs.ucla.edu> * buffer.h: Include <sys/types.h> instead of <time.h>. 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/>. */ #ifndef KEYMAP_H #define KEYMAP_H +/* The maximum byte size consumed by push_key_description. + All callers should assure that at least this size of memory is + allocated at the place pointed by the second argument. + + There are 6 modifiers, each consumes 2 chars. + The octal form of a character code consumes + (1 + CHARACTERBITS / 3 + 1) chars (including backslash at the head). + We need one more byte for string terminator `\0'. */ +#define KEY_DESCRIPTION_SIZE ((2 * 6) + 1 + (CHARACTERBITS / 3) + 1 + 1) + #define KEYMAPP(m) (!NILP (get_keymap (m, 0, 0))) extern Lisp_Object Qkeymap, Qmenu_bar; extern Lisp_Object Qremap; @@ -30,6 +40,7 @@ EXFUN (Fdefine_key, 3); EXFUN (Fcommand_remapping, 3); EXFUN (Fkey_binding, 4); EXFUN (Fkey_description, 2); +extern char *push_key_description (EMACS_INT, char *, int); EXFUN (Fsingle_key_description, 2); EXFUN (Fwhere_is_internal, 5); EXFUN (Fcurrent_active_maps, 2); diff --git a/src/lisp.h b/src/lisp.h index 1f297d51596..e9a525a32b5 100644 --- a/src/lisp.h +++ b/src/lisp.h @@ -1599,16 +1599,6 @@ typedef unsigned char UCHAR; itself. */ #define CHARACTERBITS 22 -/* The maximum byte size consumed by push_key_description. - All callers should assure that at least this size of memory is - allocated at the place pointed by the second argument. - - There are 6 modifiers, each consumes 2 chars. - The octal form of a character code consumes - (1 + CHARACTERBITS / 3 + 1) chars (including backslash at the head). - We need one more byte for string terminator `\0'. */ -#define KEY_DESCRIPTION_SIZE ((2 * 6) + 1 + (CHARACTERBITS / 3) + 1 + 1) - /* The glyph datatype, used to represent characters on the display. It consists of a char code and a face id. */ @@ -3258,8 +3248,6 @@ extern void force_auto_save_soon (void); extern void init_keyboard (void); extern void syms_of_keyboard (void); extern void keys_of_keyboard (void); -extern char *push_key_description (EMACS_INT, char *, int); - /* Defined in indent.c */ EXFUN (Fvertical_motion, 2); |