Mercurial > emacs

comparison src/lisp.h @ 32988:c3435dc00ed7

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
* lisp.h (KEYMAPP): New macro. (get_keymap): Remove. (get_keymap_1): Rename get_keymap. * keyboard.h (get_keymap_1, Fkeymapp): Remove prototype. * xterm.c (note_mode_line_highlight): Use KEYMAPP. * xmenu.c (single_submenu): Use KEYMAPP. (Fx_popup_menu): Fetch keymaps rather than checking Fkeymapp. Use KEYMAPP rather than Fkeymapp. * w32term.c (note_mode_line_highlight): Use KEYMAPP. * w32menu.c (True, False): Remove (use TRUE and FALSE instead). (Fx_popup_menu): Fetch keymaps rather than checking Fkeymapp. Use KEYMAPP rather than Fkeymapp. (single_submenu): Use KEYMAPP. (w32_menu_show, w32_dialog_show): Use TRUE. * minibuf.c (Fread_from_minibuffer): Update call to get_keymap. * keymap.c (KEYMAPP): Remove (moved to lisp.h). (Fkeymapp): Use KEYMAPP. (get_keymap): Rename from get_keymap_1. Remove old def. Return t when autoload=0 and error=0 and the keymap needs autoloading. (Fcopy_keymap): Check (eq (car x) 'keymap) rather than using Fkeymapp. (Fminor_mode_key_binding): Don't raise an error if the binding is not a keymap. (Fuse_global_map, Fuse_local_map): Allow autoloading. (Faccessible_keymaps): Fetch keymaps rather than checking Fkeymapp. * keyboard.c (read_char): get_keymap_1 -> get_keymap. Allow Vspecial_event_map to be autoloaded. (menu_bar_items): Fetch the keymap rather than using keymapp. (menu_bar_one_keymap): No need to follow func-indirect any more. (parse_menu_item): get_keymap_1 -> get_keymap. (tool_bar_items): Fetch the keymap rather than using keymapp. (read_key_sequence): Use KEYMAPP. * intervals.c (get_local_map): Use get_keymap rather than following function-indirections explicitly. * doc.c (Fsubstitute_command_keys): get_keymap_1 -> get_keymap.
author Stefan Monnier <monnier@iro.umontreal.ca>
date Fri, 27 Oct 2000 22:20:19 +0000
parents 303e2612e332
children 6d19f06da8a4
comparison
equal deleted inserted replaced
32987:a2813d16337d 32988:c3435dc00ed7
2580 extern void syms_of_keyboard P_ ((void)); 2580 extern void syms_of_keyboard P_ ((void));
2581 extern void keys_of_keyboard P_ ((void)); 2581 extern void keys_of_keyboard P_ ((void));
2582 2582
2583 /* defined in keymap.c */ 2583 /* defined in keymap.c */
2584 2584
2585 #define KEYMAPP(m) (!NILP (get_keymap (m, 0, 0)))
2585 extern Lisp_Object Qkeymap, Qmenu_bar; 2586 extern Lisp_Object Qkeymap, Qmenu_bar;
2586 extern Lisp_Object current_global_map; 2587 extern Lisp_Object current_global_map;
2587 EXFUN (Fmake_sparse_keymap, 1); 2588 EXFUN (Fmake_sparse_keymap, 1);
2588 EXFUN (Fcopy_keymap, 1); 2589 EXFUN (Fcopy_keymap, 1);
2589 EXFUN (Fdefine_key, 3); 2590 EXFUN (Fdefine_key, 3);
2592 EXFUN (Fkey_description, 1); 2593 EXFUN (Fkey_description, 1);
2593 EXFUN (Fsingle_key_description, 2); 2594 EXFUN (Fsingle_key_description, 2);
2594 EXFUN (Fwhere_is_internal, 4); 2595 EXFUN (Fwhere_is_internal, 4);
2595 extern Lisp_Object access_keymap P_ ((Lisp_Object, Lisp_Object, int, int, int)); 2596 extern Lisp_Object access_keymap P_ ((Lisp_Object, Lisp_Object, int, int, int));
2596 extern Lisp_Object get_keyelt P_ ((Lisp_Object, int)); 2597 extern Lisp_Object get_keyelt P_ ((Lisp_Object, int));
2597 extern Lisp_Object get_keymap P_ ((Lisp_Object)); 2598 extern Lisp_Object get_keymap P_ ((Lisp_Object, int, int));
2598 extern Lisp_Object get_keymap_1 P_ ((Lisp_Object, int, int));
2599 extern void describe_vector P_ ((Lisp_Object, Lisp_Object, 2599 extern void describe_vector P_ ((Lisp_Object, Lisp_Object,
2600 void (*) (Lisp_Object), int, 2600 void (*) (Lisp_Object), int,
2601 Lisp_Object, Lisp_Object, int *, int)); 2601 Lisp_Object, Lisp_Object, int *, int));
2602 extern void describe_map_tree P_ ((Lisp_Object, int, Lisp_Object, Lisp_Object, 2602 extern void describe_map_tree P_ ((Lisp_Object, int, Lisp_Object, Lisp_Object,
2603 char *, int, int, int)); 2603 char *, int, int, int));