[Emacs-diffs] /srv/bzr/emacs/trunk r105711: * keymap.h (KEY_DESCRIPTION_SIZE, push_key_description): Move decls

[Paul Eggert]

------------------------------------------------------------
revno: 105711
committer: Paul Eggert <address@hidden>
branch nick: trunk
timestamp: Sat 2011-09-10 17:41:48 -0700
message:
  * 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.
modified:
  src/ChangeLog
  src/keymap.h
  src/lisp.h

=== modified file 'src/ChangeLog'
--- a/src/ChangeLog     2011-09-10 19:41:33 +0000
+++ b/src/ChangeLog     2011-09-11 00:41:48 +0000
@@ -1,3 +1,12 @@
+2011-09-11  Paul Eggert  <address@hidden>
+
+       * 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  <address@hidden>
 
        * buffer.h: Include <sys/types.h> instead of <time.h>.

=== modified file 'src/keymap.h'
--- a/src/keymap.h      2011-07-29 00:32:09 +0000
+++ b/src/keymap.h      2011-09-11 00:41:48 +0000
@@ -19,6 +19,16 @@
 #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 (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);

=== modified file 'src/lisp.h'
--- a/src/lisp.h        2011-09-09 01:06:52 +0000
+++ b/src/lisp.h        2011-09-11 00:41:48 +0000
@@ -1599,16 +1599,6 @@
    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 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);