Mercurial > hg > xemacs-beta
annotate src/EmacsManagerP.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 |
rev | line source |
---|---|
0 | 1 /* Copyright (C) 1995 Free Software Foundation, Inc. |
2 Copyright (C) 1993-1995 Sun Microsystems, Inc. | |
3 Copyright (C) 1995 Ben Wing. | |
4 | |
5 This file is part of XEmacs. | |
6 | |
5402
308d34e9f07d
Changed bulk of GPLv2 or later files identified by script
Mats Lidell <matsl@xemacs.org>
parents:
398
diff
changeset
|
7 XEmacs is free software: you can redistribute it and/or modify it |
0 | 8 under the terms of the GNU General Public License as published by the |
5402
308d34e9f07d
Changed bulk of GPLv2 or later files identified by script
Mats Lidell <matsl@xemacs.org>
parents:
398
diff
changeset
|
9 Free Software Foundation, either version 3 of the License, or (at your |
308d34e9f07d
Changed bulk of GPLv2 or later files identified by script
Mats Lidell <matsl@xemacs.org>
parents:
398
diff
changeset
|
10 option) any later version. |
0 | 11 |
12 XEmacs is distributed in the hope that it will be useful, but WITHOUT | |
13 ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or | |
14 FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License | |
15 for more details. | |
16 | |
17 You should have received a copy of the GNU General Public License | |
5402
308d34e9f07d
Changed bulk of GPLv2 or later files identified by script
Mats Lidell <matsl@xemacs.org>
parents:
398
diff
changeset
|
18 along with XEmacs. If not, see <http://www.gnu.org/licenses/>. */ |
0 | 19 |
20 /* Synched up with: Not in FSF. */ | |
21 | |
22 /* Written by Ben Wing. */ | |
23 | |
398 | 24 #ifndef INCLUDED_EmacsManagerP_h_ |
25 #define INCLUDED_EmacsManagerP_h_ | |
0 | 26 |
27 | |
28 #include "xintrinsicp.h" | |
29 #ifdef LWLIB_USES_MOTIF | |
30 #include "xmmanagerp.h" | |
31 #endif | |
32 #include "EmacsManager.h" | |
33 | |
34 typedef struct { /* new fields for EmacsManager class */ | |
35 int dummy; | |
36 } EmacsManagerClassPart; | |
37 | |
38 typedef struct _EmacsManagerClassRec { /* full class record declaration */ | |
39 CoreClassPart core_class; | |
40 CompositeClassPart composite_class; | |
41 #ifdef LWLIB_USES_MOTIF | |
42 ConstraintClassPart constraint_class; | |
43 XmManagerClassPart manager_class; | |
44 #endif | |
45 EmacsManagerClassPart emacs_manager_class; | |
46 } EmacsManagerClassRec; | |
47 | |
48 typedef struct { /* new fields for EmacsManager widget */ | |
49 XtCallbackList resize_callback; | |
50 XtCallbackList query_geometry_callback; | |
51 XtPointer user_data; | |
52 } EmacsManagerPart; | |
53 | |
54 typedef struct _EmacsManagerRec { /* full instance record */ | |
55 CorePart core; | |
56 CompositePart composite; | |
57 #ifdef LWLIB_USES_MOTIF | |
58 ConstraintPart constraint; | |
59 XmManagerPart manager; | |
60 #endif | |
61 EmacsManagerPart emacs_manager; | |
62 } EmacsManagerRec; | |
63 | |
64 extern EmacsManagerClassRec emacsManagerClassRec; /* class pointer */ | |
65 | |
398 | 66 #endif /* INCLUDED_EmacsManagerP_h_ */ |