(U-0002195D): Add `ideographic-structure'; add `sound@ja/on'; add

[chise/xemacs-chise.git.1] / src / keymap.h

diff --git a/src/keymap.h b/src/keymap.h
index bb0c8a0..fc3b54e 100644 (file)
--- a/src/keymap.h
+++ b/src/keymap.h
@@ -21,14 +21,15 @@ Boston, MA 02111-1307, USA.  */
 /* Synched up with: Not in FSF. */
 
 
-#ifndef _XEMACS_KEYMAP_H_
-#define _XEMACS_KEYMAP_H_
+#ifndef INCLUDED_keymap_h_
+#define INCLUDED_keymap_h_
 
-DECLARE_LRECORD (keymap, struct Lisp_Keymap);
-#define XKEYMAP(x) XRECORD (x, keymap, struct Lisp_Keymap)
+typedef struct Lisp_Keymap Lisp_Keymap;
+
+DECLARE_LRECORD (keymap, Lisp_Keymap);
+#define XKEYMAP(x) XRECORD (x, keymap, Lisp_Keymap)
 #define XSETKEYMAP(x, p) XSETRECORD (x, p, keymap)
 #define KEYMAPP(x) RECORDP (x, keymap)
-#define GC_KEYMAPP(x) GC_RECORDP (x, keymap)
 #define CHECK_KEYMAP(x) CHECK_RECORD (x, keymap)
 #define CONCHECK_KEYMAP(x) CONCHECK_RECORD (x, keymap)
 
@@ -38,6 +39,7 @@ EXFUN (Fmake_keymap, 1);
 EXFUN (Fwhere_is_internal, 5);
 
 extern Lisp_Object Qalt, Qcontrol, Qhyper, Qmeta, Qshift, Qsuper;
+extern Lisp_Object Qbutton1, Qbutton2, Qbutton3, Qbutton4, Qbutton5;
 extern Lisp_Object Vmeta_prefix_char;
 
 Lisp_Object get_keymap (Lisp_Object object, int errorp, int autoload);
@@ -56,7 +58,7 @@ void describe_map_tree (Lisp_Object startmap, int partial,
 void key_desc_list_to_event (Lisp_Object list, Lisp_Object event,
                             int allow_menu_events);
 
-int event_matches_key_specifier_p (struct Lisp_Event *event,
+int event_matches_key_specifier_p (Lisp_Event *event,
                                   Lisp_Object key_specifier);
 
-#endif /* _XEMACS_KEYMAP_H_ */
+#endif /* INCLUDED_keymap_h_ */