Mercurial > hg > xemacs-beta
view src/menubar.h @ 5679:a81a739181dc
Add command remapping, a more robust alternative to #'substitute-key-definition
src/ChangeLog addition:
2012-09-02 Aidan Kehoe <kehoea@parhasard.net>
* keymap.c:
Add command remapping, a more robust equivalent to
#'substitute-key-definition.
* keymap.c (CHECK_REMAPPING_POSITION): New.
* keymap.c (keymap_equal): Correct a comment here.
* keymap.c (Fdefine_key): Document the command remapping syntax.
* keymap.c (Fremap_command): New.
* keymap.c (command_remapping): New.
* keymap.c (Fcommand_remapping): New.
* keymap.c (commands_remapped_to_mapper): New.
* keymap.c (commands_remapped_to_traverser): New.
* keymap.c (Fcommands_remapped_to): New.
* keymap.c (get_relevant_keymaps): Take a new POSITION argument.
* keymap.c (Fcurrent_keymaps, event_binding):
Supply the new POSITION argument to get_relevant_keymaps.
* keymap.c (Fkey_binding):
Add new arguments, NO-REMAP and POSITION.
* keymap.c (map_keymap_mapper):
* keymap.c (Fwhere_is_internal):
* keymap.c (where_is_to_char):
* keymap.c (where_is_recursive_mapper):
Don't expose the key remapping in these functions. This conflicts
with GNU, but is more sane for our callers. Access to command
remapping is with the functions #'command-remapping,
#'commands-remapped-to, and #'remap-command, not with the general
keymap functions, apart from the compatibility hack in #'define-key.
* keymap.c (syms_of_keymap):
* keymap.c (vars_of_keymap):
* keymap.c (complex_vars_of_keymap):
* lisp.h: New CHECK_COMMAND macro.
man/ChangeLog addition:
2012-09-02 Aidan Kehoe <kehoea@parhasard.net>
* lispref/keymaps.texi (Keymaps):
* lispref/keymaps.texi (Changing Key Bindings):
* lispref/keymaps.texi (Scanning Keymaps):
* lispref/keymaps.texi (Remapping commands):
* lispref/keymaps.texi (XEmacs): New.
* lispref/keymaps.texi (Other Keymap Functions):
Document the new command remapping functionality in this file.
lisp/ChangeLog addition:
2012-09-02 Aidan Kehoe <kehoea@parhasard.net>
* help.el (describe-function-1):
Document any command remapping that has been done in this function.
tests/ChangeLog addition:
2012-09-02 Aidan Kehoe <kehoea@parhasard.net>
* automated/keymap-tests.el:
Test the new command remapping functionality.
author | Aidan Kehoe <kehoea@parhasard.net> |
---|---|
date | Sun, 02 Sep 2012 14:31:40 +0100 |
parents | 308d34e9f07d |
children |
line wrap: on
line source
/* Define generic menubar support. Copyright (C) 1995 Board of Trustees, University of Illinois. This file is part of XEmacs. XEmacs is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. XEmacs is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. You should have received a copy of the GNU General Public License along with XEmacs. If not, see <http://www.gnu.org/licenses/>. */ /* Synched up with: Not in FSF. */ /* #### Still needs some device-abstraction work. */ #ifndef INCLUDED_menubar_h_ #define INCLUDED_menubar_h_ #ifdef HAVE_MENUBARS #include "gui.h" void update_frame_menubars (struct frame *f); void free_frame_menubars (struct frame *f); Lisp_Object menu_parse_submenu_keywords (Lisp_Object desc, Lisp_Object gui_item); Lisp_Object current_frame_menubar (const struct frame *f); EXFUN (Fmenu_find_real_submenu, 2); extern Lisp_Object Vmenu_accelerator_prefix; extern Lisp_Object Vmenu_accelerator_modifiers; extern Lisp_Object Vmenu_accelerator_enabled; extern Lisp_Object Vmenu_accelerator_map; extern Lisp_Object Qmenu_force; extern Lisp_Object Qmenu_fallback; extern Lisp_Object Qmenu_quit; extern Lisp_Object Qmenu_up; extern Lisp_Object Qmenu_down; extern Lisp_Object Qmenu_left; extern Lisp_Object Qmenu_right; extern Lisp_Object Qmenu_select; extern Lisp_Object Qmenu_escape; /* #### kluuuuuuuuuuuuuuuuuuuuuuuuuuuudge! The author of the accelerator code didn't know what the hell he was doing. Someone needs to abstract this properly. */ #if defined (HAVE_X_WINDOWS) && defined (LWLIB_MENUBARS_LUCID) extern int x_kludge_lw_menu_active (void); struct command_builder; Lisp_Object command_builder_find_menu_accelerator (struct command_builder *builder); Lisp_Object command_builder_operate_menu_accelerator (struct command_builder *builder); #endif extern int popup_menu_up_p; extern int menubar_show_keybindings; extern int popup_menu_titles; extern int in_menu_callback; #endif /* HAVE_MENUBARS */ #endif /* INCLUDED_menubar_h_ */