Mercurial > emacs
annotate src/keymap.c @ 109576:faeb6f3341b1
Fix some stuff that didn't compile.
* frame.h (Qtty_color_mode): Move declaration out of HAVE_WINDOW_SYSTEM.
* vm-limit.c (POINTER): Add typedef for it.
(start_of_data): Change return type from POINTER to char *.
author | Jan D. <jan.h.d@swipnet.se> |
---|---|
date | Thu, 29 Jul 2010 08:59:29 +0200 |
parents | 228a5fa4eda0 |
children | 0a12f74cc5d8 |
rev | line source |
---|---|
250 | 1 /* Manipulation of keymaps |
64770
a0d1312ede66
Update years in copyright notice; nfc.
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
64470
diff
changeset
|
2 Copyright (C) 1985, 1986, 1987, 1988, 1993, 1994, 1995, |
a0d1312ede66
Update years in copyright notice; nfc.
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
64470
diff
changeset
|
3 1998, 1999, 2000, 2001, 2002, 2003, 2004, |
106815 | 4 2005, 2006, 2007, 2008, 2009, 2010 Free Software Foundation, Inc. |
250 | 5 |
6 This file is part of GNU Emacs. | |
7 | |
94963
8971ddf55736
Switch to recommended form of GPLv3 permissions notice.
Glenn Morris <rgm@gnu.org>
parents:
93882
diff
changeset
|
8 GNU Emacs is free software: you can redistribute it and/or modify |
250 | 9 it under the terms of the GNU General Public License as published by |
94963
8971ddf55736
Switch to recommended form of GPLv3 permissions notice.
Glenn Morris <rgm@gnu.org>
parents:
93882
diff
changeset
|
10 the Free Software Foundation, either version 3 of the License, or |
8971ddf55736
Switch to recommended form of GPLv3 permissions notice.
Glenn Morris <rgm@gnu.org>
parents:
93882
diff
changeset
|
11 (at your option) any later version. |
250 | 12 |
13 GNU Emacs is distributed in the hope that it will be useful, | |
14 but WITHOUT ANY WARRANTY; without even the implied warranty of | |
15 MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the | |
16 GNU General Public License for more details. | |
17 | |
18 You should have received a copy of the GNU General Public License | |
94963
8971ddf55736
Switch to recommended form of GPLv3 permissions notice.
Glenn Morris <rgm@gnu.org>
parents:
93882
diff
changeset
|
19 along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>. */ |
250 | 20 |
21 | |
4696
1fc792473491
Include <config.h> instead of "config.h".
Roland McGrath <roland@gnu.org>
parents:
4575
diff
changeset
|
22 #include <config.h> |
250 | 23 #include <stdio.h> |
105669
68dd71358159
* alloc.c: Do not define struct catchtag.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
104971
diff
changeset
|
24 #include <setjmp.h> |
250 | 25 #include "lisp.h" |
26 #include "commands.h" | |
27 #include "buffer.h" | |
88380 | 28 #include "character.h" |
17036 | 29 #include "charset.h" |
517 | 30 #include "keyboard.h" |
83004
7900111db01c
Converted display hooks to be display-local. Plus many bugfixes.
Karoly Lorentey <lorentey@elte.hu>
parents:
52740
diff
changeset
|
31 #include "frame.h" |
2059 | 32 #include "termhooks.h" |
2439
b6c62e4abf59
Put interrupt input blocking in a separate file from xterm.h.
Jim Blandy <jimb@redhat.com>
parents:
2358
diff
changeset
|
33 #include "blockinput.h" |
13771
28790743a5a3
(Fkey_binding): Handle text-property keymaps.
Karl Heuer <kwzh@gnu.org>
parents:
13343
diff
changeset
|
34 #include "puresize.h" |
29282 | 35 #include "intervals.h" |
39697
0b986bb45526
Include keymap.h.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
39689
diff
changeset
|
36 #include "keymap.h" |
72889
25c755416160
* NEWS: explain new behavior and arguments of `key-binding' and
David Kastrup <dak@gnu.org>
parents:
72806
diff
changeset
|
37 #include "window.h" |
250 | 38 |
1209
1aa2cd425737
* keymap.c (DENSE_TABLE_SIZE): Doc fix.
Jim Blandy <jimb@redhat.com>
parents:
1160
diff
changeset
|
39 /* The number of elements in keymap vectors. */ |
250 | 40 #define DENSE_TABLE_SIZE (0200) |
41 | |
42 /* Actually allocate storage for these variables */ | |
43 | |
44 Lisp_Object current_global_map; /* Current global keymap */ | |
45 | |
46 Lisp_Object global_map; /* default global key bindings */ | |
47 | |
48 Lisp_Object meta_map; /* The keymap used for globally bound | |
49 ESC-prefixed default commands */ | |
50 | |
51 Lisp_Object control_x_map; /* The keymap used for globally bound | |
52 C-x-prefixed default commands */ | |
53 | |
54 /* was MinibufLocalMap */ | |
55 Lisp_Object Vminibuffer_local_map; | |
56 /* The keymap used by the minibuf for local | |
57 bindings when spaces are allowed in the | |
58 minibuf */ | |
59 | |
60 /* was MinibufLocalNSMap */ | |
41293
3db86c7bf56f
(Fdescribe_vector): Add `describer' parameter.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
41001
diff
changeset
|
61 Lisp_Object Vminibuffer_local_ns_map; |
250 | 62 /* The keymap used by the minibuf for local |
63 bindings when spaces are not encouraged | |
64 in the minibuf */ | |
65 | |
66 /* keymap used for minibuffers when doing completion */ | |
67 /* was MinibufLocalCompletionMap */ | |
68 Lisp_Object Vminibuffer_local_completion_map; | |
69 | |
67259
134dc8d03e55
(Vminibuffer_local_filename_completion_map)
Eli Zaretskii <eliz@gnu.org>
parents:
67070
diff
changeset
|
70 /* keymap used for minibuffers when doing completion in filenames */ |
134dc8d03e55
(Vminibuffer_local_filename_completion_map)
Eli Zaretskii <eliz@gnu.org>
parents:
67070
diff
changeset
|
71 Lisp_Object Vminibuffer_local_filename_completion_map; |
134dc8d03e55
(Vminibuffer_local_filename_completion_map)
Eli Zaretskii <eliz@gnu.org>
parents:
67070
diff
changeset
|
72 |
68758
13c1b7c5f555
* data.c (Findirect_function): Add NOERROR arg. All callers changed
Kim F. Storm <storm@cua.dk>
parents:
68651
diff
changeset
|
73 /* keymap used for minibuffers when doing completion in filenames |
67259
134dc8d03e55
(Vminibuffer_local_filename_completion_map)
Eli Zaretskii <eliz@gnu.org>
parents:
67070
diff
changeset
|
74 with require-match*/ |
95575
d34a432d5863
* keymap.c (Vminibuffer_local_filename_must_match_map):
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
94963
diff
changeset
|
75 Lisp_Object Vminibuffer_local_filename_must_match_map; |
67259
134dc8d03e55
(Vminibuffer_local_filename_completion_map)
Eli Zaretskii <eliz@gnu.org>
parents:
67070
diff
changeset
|
76 |
250 | 77 /* keymap used for minibuffers when doing completion and require a match */ |
78 /* was MinibufLocalMustMatchMap */ | |
79 Lisp_Object Vminibuffer_local_must_match_map; | |
80 | |
465 | 81 /* Alist of minor mode variables and keymaps. */ |
82 Lisp_Object Vminor_mode_map_alist; | |
83 | |
20517
40bfe766d355
(Vminor_mode_overriding_map_alist): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
20381
diff
changeset
|
84 /* Alist of major-mode-specific overrides for |
40bfe766d355
(Vminor_mode_overriding_map_alist): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
20381
diff
changeset
|
85 minor mode variables and keymaps. */ |
40bfe766d355
(Vminor_mode_overriding_map_alist): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
20381
diff
changeset
|
86 Lisp_Object Vminor_mode_overriding_map_alist; |
40bfe766d355
(Vminor_mode_overriding_map_alist): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
20381
diff
changeset
|
87 |
45222
c525c7445e1b
(Vemulation_mode_map_alists): New variable.
Kim F. Storm <storm@cua.dk>
parents:
43504
diff
changeset
|
88 /* List of emulation mode keymap alists. */ |
c525c7445e1b
(Vemulation_mode_map_alists): New variable.
Kim F. Storm <storm@cua.dk>
parents:
43504
diff
changeset
|
89 Lisp_Object Vemulation_mode_map_alists; |
c525c7445e1b
(Vemulation_mode_map_alists): New variable.
Kim F. Storm <storm@cua.dk>
parents:
43504
diff
changeset
|
90 |
12297
fe458a8ecfa2
(Vdefine_key_rebound_commands): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
12262
diff
changeset
|
91 /* A list of all commands given new bindings since a certain time |
fe458a8ecfa2
(Vdefine_key_rebound_commands): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
12262
diff
changeset
|
92 when nil was stored here. |
fe458a8ecfa2
(Vdefine_key_rebound_commands): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
12262
diff
changeset
|
93 This is used to speed up recomputation of menu key equivalents |
fe458a8ecfa2
(Vdefine_key_rebound_commands): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
12262
diff
changeset
|
94 when Emacs starts up. t means don't record anything here. */ |
fe458a8ecfa2
(Vdefine_key_rebound_commands): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
12262
diff
changeset
|
95 Lisp_Object Vdefine_key_rebound_commands; |
fe458a8ecfa2
(Vdefine_key_rebound_commands): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
12262
diff
changeset
|
96 |
43494
b5b76b498398
The following changes rework my patch of 2002-02-06 which
Kim F. Storm <storm@cua.dk>
parents:
43164
diff
changeset
|
97 Lisp_Object Qkeymapp, Qkeymap, Qnon_ascii, Qmenu_item, Qremap; |
104922
c603ee2aac17
* keymap.c (QCadvertised_binding): New constant.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
104919
diff
changeset
|
98 Lisp_Object QCadvertised_binding; |
250 | 99 |
42381
810b3bfc52cf
Fix previous change; also correct its change log:
Richard M. Stallman <rms@gnu.org>
parents:
42378
diff
changeset
|
100 /* Alist of elements like (DEL . "\d"). */ |
810b3bfc52cf
Fix previous change; also correct its change log:
Richard M. Stallman <rms@gnu.org>
parents:
42378
diff
changeset
|
101 static Lisp_Object exclude_keys; |
810b3bfc52cf
Fix previous change; also correct its change log:
Richard M. Stallman <rms@gnu.org>
parents:
42378
diff
changeset
|
102 |
49757
9fe119b14379
Renamed remap-command to command-remapping. All uses changed.
Kim F. Storm <storm@cua.dk>
parents:
49720
diff
changeset
|
103 /* Pre-allocated 2-element vector for Fcommand_remapping to use. */ |
9fe119b14379
Renamed remap-command to command-remapping. All uses changed.
Kim F. Storm <storm@cua.dk>
parents:
49720
diff
changeset
|
104 static Lisp_Object command_remapping_vector; |
43494
b5b76b498398
The following changes rework my patch of 2002-02-06 which
Kim F. Storm <storm@cua.dk>
parents:
43164
diff
changeset
|
105 |
2886 | 106 /* A char with the CHAR_META bit set in a vector or the 0200 bit set |
107 in a string key sequence is equivalent to prefixing with this | |
108 character. */ | |
250 | 109 extern Lisp_Object meta_prefix_char; |
110 | |
32889
673e3ef1f7f6
(where_is_cache, where_is_cache_keymaps): New vars.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
32846
diff
changeset
|
111 /* Hash table used to cache a reverse-map to speed up calls to where-is. */ |
673e3ef1f7f6
(where_is_cache, where_is_cache_keymaps): New vars.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
32846
diff
changeset
|
112 static Lisp_Object where_is_cache; |
673e3ef1f7f6
(where_is_cache, where_is_cache_keymaps): New vars.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
32846
diff
changeset
|
113 /* Which keymaps are reverse-stored in the cache. */ |
673e3ef1f7f6
(where_is_cache, where_is_cache_keymaps): New vars.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
32846
diff
changeset
|
114 static Lisp_Object where_is_cache_keymaps; |
673e3ef1f7f6
(where_is_cache, where_is_cache_keymaps): New vars.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
32846
diff
changeset
|
115 |
109100
2bc9a0c04c87
Remove __P and P_ from .c and .m files and definition of P_
Jan D <jan.h.d@swipnet.se>
parents:
108858
diff
changeset
|
116 static Lisp_Object store_in_keymap (Lisp_Object, Lisp_Object, Lisp_Object); |
2bc9a0c04c87
Remove __P and P_ from .c and .m files and definition of P_
Jan D <jan.h.d@swipnet.se>
parents:
108858
diff
changeset
|
117 static void fix_submap_inheritance (Lisp_Object, Lisp_Object, Lisp_Object); |
2bc9a0c04c87
Remove __P and P_ from .c and .m files and definition of P_
Jan D <jan.h.d@swipnet.se>
parents:
108858
diff
changeset
|
118 |
2bc9a0c04c87
Remove __P and P_ from .c and .m files and definition of P_
Jan D <jan.h.d@swipnet.se>
parents:
108858
diff
changeset
|
119 static Lisp_Object define_as_prefix (Lisp_Object, Lisp_Object); |
2bc9a0c04c87
Remove __P and P_ from .c and .m files and definition of P_
Jan D <jan.h.d@swipnet.se>
parents:
108858
diff
changeset
|
120 static void describe_command (Lisp_Object, Lisp_Object); |
2bc9a0c04c87
Remove __P and P_ from .c and .m files and definition of P_
Jan D <jan.h.d@swipnet.se>
parents:
108858
diff
changeset
|
121 static void describe_translation (Lisp_Object, Lisp_Object); |
2bc9a0c04c87
Remove __P and P_ from .c and .m files and definition of P_
Jan D <jan.h.d@swipnet.se>
parents:
108858
diff
changeset
|
122 static void describe_map (Lisp_Object, Lisp_Object, |
2bc9a0c04c87
Remove __P and P_ from .c and .m files and definition of P_
Jan D <jan.h.d@swipnet.se>
parents:
108858
diff
changeset
|
123 void (*) (Lisp_Object, Lisp_Object), |
2bc9a0c04c87
Remove __P and P_ from .c and .m files and definition of P_
Jan D <jan.h.d@swipnet.se>
parents:
108858
diff
changeset
|
124 int, Lisp_Object, Lisp_Object*, int, int); |
2bc9a0c04c87
Remove __P and P_ from .c and .m files and definition of P_
Jan D <jan.h.d@swipnet.se>
parents:
108858
diff
changeset
|
125 static void describe_vector (Lisp_Object, Lisp_Object, Lisp_Object, |
2bc9a0c04c87
Remove __P and P_ from .c and .m files and definition of P_
Jan D <jan.h.d@swipnet.se>
parents:
108858
diff
changeset
|
126 void (*) (Lisp_Object, Lisp_Object), int, |
2bc9a0c04c87
Remove __P and P_ from .c and .m files and definition of P_
Jan D <jan.h.d@swipnet.se>
parents:
108858
diff
changeset
|
127 Lisp_Object, Lisp_Object, int *, |
2bc9a0c04c87
Remove __P and P_ from .c and .m files and definition of P_
Jan D <jan.h.d@swipnet.se>
parents:
108858
diff
changeset
|
128 int, int, int); |
2bc9a0c04c87
Remove __P and P_ from .c and .m files and definition of P_
Jan D <jan.h.d@swipnet.se>
parents:
108858
diff
changeset
|
129 static void silly_event_symbol_error (Lisp_Object); |
250 | 130 |
465 | 131 /* Keymap object support - constructors and predicates. */ |
132 | |
1095
6578f07e9eb8
(Fmake_sparse_keymap, Fmake_keymap): New optional arg. Callers changed.
Richard M. Stallman <rms@gnu.org>
parents:
647
diff
changeset
|
133 DEFUN ("make-keymap", Fmake_keymap, Smake_keymap, 0, 1, 0, |
41001
a17c8b15ef1b
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
40804
diff
changeset
|
134 doc: /* Construct and return a new keymap, of the form (keymap CHARTABLE . ALIST). |
56635
a8be0bc345d2
(Fmake_keymap, Fmap_keymap, Fwhere_is_internal): Doc fixes.
Luc Teirlinck <teirllm@auburn.edu>
parents:
56618
diff
changeset
|
135 CHARTABLE is a char-table that holds the bindings for all characters |
a8be0bc345d2
(Fmake_keymap, Fmap_keymap, Fwhere_is_internal): Doc fixes.
Luc Teirlinck <teirllm@auburn.edu>
parents:
56618
diff
changeset
|
136 without modifiers. All entries in it are initially nil, meaning |
a8be0bc345d2
(Fmake_keymap, Fmap_keymap, Fwhere_is_internal): Doc fixes.
Luc Teirlinck <teirllm@auburn.edu>
parents:
56618
diff
changeset
|
137 "command undefined". ALIST is an assoc-list which holds bindings for |
a8be0bc345d2
(Fmake_keymap, Fmap_keymap, Fwhere_is_internal): Doc fixes.
Luc Teirlinck <teirllm@auburn.edu>
parents:
56618
diff
changeset
|
138 function keys, mouse events, and any other things that appear in the |
a8be0bc345d2
(Fmake_keymap, Fmap_keymap, Fwhere_is_internal): Doc fixes.
Luc Teirlinck <teirllm@auburn.edu>
parents:
56618
diff
changeset
|
139 input stream. Initially, ALIST is nil. |
41001
a17c8b15ef1b
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
40804
diff
changeset
|
140 |
a17c8b15ef1b
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
40804
diff
changeset
|
141 The optional arg STRING supplies a menu name for the keymap |
a17c8b15ef1b
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
40804
diff
changeset
|
142 in case you use it as a menu with `x-popup-menu'. */) |
109179
8cfee7d2955f
Convert DEFUNs to standard C.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
109165
diff
changeset
|
143 (Lisp_Object string) |
250 | 144 { |
1095
6578f07e9eb8
(Fmake_sparse_keymap, Fmake_keymap): New optional arg. Callers changed.
Richard M. Stallman <rms@gnu.org>
parents:
647
diff
changeset
|
145 Lisp_Object tail; |
6578f07e9eb8
(Fmake_sparse_keymap, Fmake_keymap): New optional arg. Callers changed.
Richard M. Stallman <rms@gnu.org>
parents:
647
diff
changeset
|
146 if (!NILP (string)) |
6578f07e9eb8
(Fmake_sparse_keymap, Fmake_keymap): New optional arg. Callers changed.
Richard M. Stallman <rms@gnu.org>
parents:
647
diff
changeset
|
147 tail = Fcons (string, Qnil); |
6578f07e9eb8
(Fmake_sparse_keymap, Fmake_keymap): New optional arg. Callers changed.
Richard M. Stallman <rms@gnu.org>
parents:
647
diff
changeset
|
148 else |
6578f07e9eb8
(Fmake_sparse_keymap, Fmake_keymap): New optional arg. Callers changed.
Richard M. Stallman <rms@gnu.org>
parents:
647
diff
changeset
|
149 tail = Qnil; |
250 | 150 return Fcons (Qkeymap, |
17788
208d71ea3a4f
(get_keyelt): Handle an indirect entry with meta char.
Richard M. Stallman <rms@gnu.org>
parents:
17511
diff
changeset
|
151 Fcons (Fmake_char_table (Qkeymap, Qnil), tail)); |
250 | 152 } |
153 | |
1095
6578f07e9eb8
(Fmake_sparse_keymap, Fmake_keymap): New optional arg. Callers changed.
Richard M. Stallman <rms@gnu.org>
parents:
647
diff
changeset
|
154 DEFUN ("make-sparse-keymap", Fmake_sparse_keymap, Smake_sparse_keymap, 0, 1, 0, |
41001
a17c8b15ef1b
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
40804
diff
changeset
|
155 doc: /* Construct and return a new sparse keymap. |
a17c8b15ef1b
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
40804
diff
changeset
|
156 Its car is `keymap' and its cdr is an alist of (CHAR . DEFINITION), |
a17c8b15ef1b
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
40804
diff
changeset
|
157 which binds the character CHAR to DEFINITION, or (SYMBOL . DEFINITION), |
a17c8b15ef1b
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
40804
diff
changeset
|
158 which binds the function key or mouse event SYMBOL to DEFINITION. |
a17c8b15ef1b
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
40804
diff
changeset
|
159 Initially the alist is nil. |
a17c8b15ef1b
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
40804
diff
changeset
|
160 |
a17c8b15ef1b
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
40804
diff
changeset
|
161 The optional arg STRING supplies a menu name for the keymap |
a17c8b15ef1b
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
40804
diff
changeset
|
162 in case you use it as a menu with `x-popup-menu'. */) |
109179
8cfee7d2955f
Convert DEFUNs to standard C.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
109165
diff
changeset
|
163 (Lisp_Object string) |
250 | 164 { |
1095
6578f07e9eb8
(Fmake_sparse_keymap, Fmake_keymap): New optional arg. Callers changed.
Richard M. Stallman <rms@gnu.org>
parents:
647
diff
changeset
|
165 if (!NILP (string)) |
105744
b0a732611398
* keymap.c (Fmake_sparse_keymap): Purecopy the name.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
105669
diff
changeset
|
166 { |
b0a732611398
* keymap.c (Fmake_sparse_keymap): Purecopy the name.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
105669
diff
changeset
|
167 if (!NILP (Vpurify_flag)) |
b0a732611398
* keymap.c (Fmake_sparse_keymap): Purecopy the name.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
105669
diff
changeset
|
168 string = Fpurecopy (string); |
b0a732611398
* keymap.c (Fmake_sparse_keymap): Purecopy the name.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
105669
diff
changeset
|
169 return Fcons (Qkeymap, Fcons (string, Qnil)); |
b0a732611398
* keymap.c (Fmake_sparse_keymap): Purecopy the name.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
105669
diff
changeset
|
170 } |
250 | 171 return Fcons (Qkeymap, Qnil); |
172 } | |
173 | |
174 /* This function is used for installing the standard key bindings | |
175 at initialization time. | |
176 | |
177 For example: | |
178 | |
1388
02226bff1476
* keymap.c (initial_define_lispy_key): New function, for defining
Jim Blandy <jimb@redhat.com>
parents:
1315
diff
changeset
|
179 initial_define_key (control_x_map, Ctl('X'), "exchange-point-and-mark"); */ |
250 | 180 |
181 void | |
109126
aec1143e8d85
Convert (most) functions in src to standard C.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
109100
diff
changeset
|
182 initial_define_key (Lisp_Object keymap, int key, char *defname) |
250 | 183 { |
105877
21bdda3ded62
* xterm.c (syms_of_xterm):
Dan Nicolaescu <dann@ics.uci.edu>
parents:
105744
diff
changeset
|
184 store_in_keymap (keymap, make_number (key), intern_c_string (defname)); |
250 | 185 } |
186 | |
1388
02226bff1476
* keymap.c (initial_define_lispy_key): New function, for defining
Jim Blandy <jimb@redhat.com>
parents:
1315
diff
changeset
|
187 void |
109126
aec1143e8d85
Convert (most) functions in src to standard C.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
109100
diff
changeset
|
188 initial_define_lispy_key (Lisp_Object keymap, char *keyname, char *defname) |
1388
02226bff1476
* keymap.c (initial_define_lispy_key): New function, for defining
Jim Blandy <jimb@redhat.com>
parents:
1315
diff
changeset
|
189 { |
105877
21bdda3ded62
* xterm.c (syms_of_xterm):
Dan Nicolaescu <dann@ics.uci.edu>
parents:
105744
diff
changeset
|
190 store_in_keymap (keymap, intern_c_string (keyname), intern_c_string (defname)); |
1388
02226bff1476
* keymap.c (initial_define_lispy_key): New function, for defining
Jim Blandy <jimb@redhat.com>
parents:
1315
diff
changeset
|
191 } |
02226bff1476
* keymap.c (initial_define_lispy_key): New function, for defining
Jim Blandy <jimb@redhat.com>
parents:
1315
diff
changeset
|
192 |
250 | 193 DEFUN ("keymapp", Fkeymapp, Skeymapp, 1, 1, 0, |
41001
a17c8b15ef1b
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
40804
diff
changeset
|
194 doc: /* Return t if OBJECT is a keymap. |
a17c8b15ef1b
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
40804
diff
changeset
|
195 |
a17c8b15ef1b
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
40804
diff
changeset
|
196 A keymap is a list (keymap . ALIST), |
a17c8b15ef1b
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
40804
diff
changeset
|
197 or a symbol whose function definition is itself a keymap. |
a17c8b15ef1b
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
40804
diff
changeset
|
198 ALIST elements look like (CHAR . DEFN) or (SYMBOL . DEFN); |
a17c8b15ef1b
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
40804
diff
changeset
|
199 a vector of densely packed bindings for small character codes |
a17c8b15ef1b
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
40804
diff
changeset
|
200 is also allowed as an element. */) |
109179
8cfee7d2955f
Convert DEFUNs to standard C.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
109165
diff
changeset
|
201 (Lisp_Object object) |
250 | 202 { |
32988
c3435dc00ed7
* lisp.h (KEYMAPP): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
32889
diff
changeset
|
203 return (KEYMAPP (object) ? Qt : Qnil); |
250 | 204 } |
205 | |
39689
0572449a62be
(Fkeymap_prompt, Fcurrent_active_maps): New funs.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
39682
diff
changeset
|
206 DEFUN ("keymap-prompt", Fkeymap_prompt, Skeymap_prompt, 1, 1, 0, |
41001
a17c8b15ef1b
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
40804
diff
changeset
|
207 doc: /* Return the prompt-string of a keymap MAP. |
a17c8b15ef1b
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
40804
diff
changeset
|
208 If non-nil, the prompt is shown in the echo-area |
a17c8b15ef1b
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
40804
diff
changeset
|
209 when reading a key-sequence to be looked-up in this keymap. */) |
109179
8cfee7d2955f
Convert DEFUNs to standard C.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
109165
diff
changeset
|
210 (Lisp_Object map) |
39689
0572449a62be
(Fkeymap_prompt, Fcurrent_active_maps): New funs.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
39682
diff
changeset
|
211 { |
58129
6f1bde62e20e
(Fkeymap_prompt): Accept symbol keymaps.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
57478
diff
changeset
|
212 map = get_keymap (map, 0, 0); |
39689
0572449a62be
(Fkeymap_prompt, Fcurrent_active_maps): New funs.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
39682
diff
changeset
|
213 while (CONSP (map)) |
0572449a62be
(Fkeymap_prompt, Fcurrent_active_maps): New funs.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
39682
diff
changeset
|
214 { |
58129
6f1bde62e20e
(Fkeymap_prompt): Accept symbol keymaps.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
57478
diff
changeset
|
215 Lisp_Object tem = XCAR (map); |
39689
0572449a62be
(Fkeymap_prompt, Fcurrent_active_maps): New funs.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
39682
diff
changeset
|
216 if (STRINGP (tem)) |
0572449a62be
(Fkeymap_prompt, Fcurrent_active_maps): New funs.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
39682
diff
changeset
|
217 return tem; |
58129
6f1bde62e20e
(Fkeymap_prompt): Accept symbol keymaps.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
57478
diff
changeset
|
218 map = XCDR (map); |
39689
0572449a62be
(Fkeymap_prompt, Fcurrent_active_maps): New funs.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
39682
diff
changeset
|
219 } |
0572449a62be
(Fkeymap_prompt, Fcurrent_active_maps): New funs.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
39682
diff
changeset
|
220 return Qnil; |
0572449a62be
(Fkeymap_prompt, Fcurrent_active_maps): New funs.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
39682
diff
changeset
|
221 } |
0572449a62be
(Fkeymap_prompt, Fcurrent_active_maps): New funs.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
39682
diff
changeset
|
222 |
250 | 223 /* Check that OBJECT is a keymap (after dereferencing through any |
1517
72b7bbcaf7d8
* keymap.c (Fdefine_key, Flookup_key, describe_map): Don't assume
Jim Blandy <jimb@redhat.com>
parents:
1441
diff
changeset
|
224 symbols). If it is, return it. |
72b7bbcaf7d8
* keymap.c (Fdefine_key, Flookup_key, describe_map): Don't assume
Jim Blandy <jimb@redhat.com>
parents:
1441
diff
changeset
|
225 |
72b7bbcaf7d8
* keymap.c (Fdefine_key, Flookup_key, describe_map): Don't assume
Jim Blandy <jimb@redhat.com>
parents:
1441
diff
changeset
|
226 If AUTOLOAD is non-zero and OBJECT is a symbol whose function value |
72b7bbcaf7d8
* keymap.c (Fdefine_key, Flookup_key, describe_map): Don't assume
Jim Blandy <jimb@redhat.com>
parents:
1441
diff
changeset
|
227 is an autoload form, do the autoload and try again. |
7998
d4b5f4dd9c51
(Flookup_key): Add gcpro.
Richard M. Stallman <rms@gnu.org>
parents:
7894
diff
changeset
|
228 If AUTOLOAD is nonzero, callers must assume GC is possible. |
1517
72b7bbcaf7d8
* keymap.c (Fdefine_key, Flookup_key, describe_map): Don't assume
Jim Blandy <jimb@redhat.com>
parents:
1441
diff
changeset
|
229 |
32988
c3435dc00ed7
* lisp.h (KEYMAPP): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
32889
diff
changeset
|
230 If the map needs to be autoloaded, but AUTOLOAD is zero (and ERROR |
c3435dc00ed7
* lisp.h (KEYMAPP): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
32889
diff
changeset
|
231 is zero as well), return Qt. |
c3435dc00ed7
* lisp.h (KEYMAPP): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
32889
diff
changeset
|
232 |
1517
72b7bbcaf7d8
* keymap.c (Fdefine_key, Flookup_key, describe_map): Don't assume
Jim Blandy <jimb@redhat.com>
parents:
1441
diff
changeset
|
233 ERROR controls how we respond if OBJECT isn't a keymap. |
72b7bbcaf7d8
* keymap.c (Fdefine_key, Flookup_key, describe_map): Don't assume
Jim Blandy <jimb@redhat.com>
parents:
1441
diff
changeset
|
234 If ERROR is non-zero, signal an error; otherwise, just return Qnil. |
72b7bbcaf7d8
* keymap.c (Fdefine_key, Flookup_key, describe_map): Don't assume
Jim Blandy <jimb@redhat.com>
parents:
1441
diff
changeset
|
235 |
72b7bbcaf7d8
* keymap.c (Fdefine_key, Flookup_key, describe_map): Don't assume
Jim Blandy <jimb@redhat.com>
parents:
1441
diff
changeset
|
236 Note that most of the time, we don't want to pursue autoloads. |
72b7bbcaf7d8
* keymap.c (Fdefine_key, Flookup_key, describe_map): Don't assume
Jim Blandy <jimb@redhat.com>
parents:
1441
diff
changeset
|
237 Functions like Faccessible_keymaps which scan entire keymap trees |
72b7bbcaf7d8
* keymap.c (Fdefine_key, Flookup_key, describe_map): Don't assume
Jim Blandy <jimb@redhat.com>
parents:
1441
diff
changeset
|
238 shouldn't load every autoloaded keymap. I'm not sure about this, |
72b7bbcaf7d8
* keymap.c (Fdefine_key, Flookup_key, describe_map): Don't assume
Jim Blandy <jimb@redhat.com>
parents:
1441
diff
changeset
|
239 but it seems to me that only read_key_sequence, Flookup_key, and |
30134
784ef95b020b
(get_keymap_1): Add comment that this function can GC.
Gerd Moellmann <gerd@gnu.org>
parents:
30030
diff
changeset
|
240 Fdefine_key should cause keymaps to be autoloaded. |
784ef95b020b
(get_keymap_1): Add comment that this function can GC.
Gerd Moellmann <gerd@gnu.org>
parents:
30030
diff
changeset
|
241 |
784ef95b020b
(get_keymap_1): Add comment that this function can GC.
Gerd Moellmann <gerd@gnu.org>
parents:
30030
diff
changeset
|
242 This function can GC when AUTOLOAD is non-zero, because it calls |
784ef95b020b
(get_keymap_1): Add comment that this function can GC.
Gerd Moellmann <gerd@gnu.org>
parents:
30030
diff
changeset
|
243 do_autoload which can GC. */ |
1517
72b7bbcaf7d8
* keymap.c (Fdefine_key, Flookup_key, describe_map): Don't assume
Jim Blandy <jimb@redhat.com>
parents:
1441
diff
changeset
|
244 |
250 | 245 Lisp_Object |
109126
aec1143e8d85
Convert (most) functions in src to standard C.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
109100
diff
changeset
|
246 get_keymap (Lisp_Object object, int error, int autoload) |
250 | 247 { |
1517
72b7bbcaf7d8
* keymap.c (Fdefine_key, Flookup_key, describe_map): Don't assume
Jim Blandy <jimb@redhat.com>
parents:
1441
diff
changeset
|
248 Lisp_Object tem; |
250 | 249 |
1517
72b7bbcaf7d8
* keymap.c (Fdefine_key, Flookup_key, describe_map): Don't assume
Jim Blandy <jimb@redhat.com>
parents:
1441
diff
changeset
|
250 autoload_retry: |
25128
2563b35e613f
(get_keymap_1, get_keyelt): Check the type of OBJECT
Karl Heuer <kwzh@gnu.org>
parents:
24572
diff
changeset
|
251 if (NILP (object)) |
2563b35e613f
(get_keymap_1, get_keyelt): Check the type of OBJECT
Karl Heuer <kwzh@gnu.org>
parents:
24572
diff
changeset
|
252 goto end; |
2563b35e613f
(get_keymap_1, get_keyelt): Check the type of OBJECT
Karl Heuer <kwzh@gnu.org>
parents:
24572
diff
changeset
|
253 if (CONSP (object) && EQ (XCAR (object), Qkeymap)) |
2563b35e613f
(get_keymap_1, get_keyelt): Check the type of OBJECT
Karl Heuer <kwzh@gnu.org>
parents:
24572
diff
changeset
|
254 return object; |
32988
c3435dc00ed7
* lisp.h (KEYMAPP): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
32889
diff
changeset
|
255 |
c3435dc00ed7
* lisp.h (KEYMAPP): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
32889
diff
changeset
|
256 tem = indirect_function (object); |
c3435dc00ed7
* lisp.h (KEYMAPP): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
32889
diff
changeset
|
257 if (CONSP (tem)) |
25128
2563b35e613f
(get_keymap_1, get_keyelt): Check the type of OBJECT
Karl Heuer <kwzh@gnu.org>
parents:
24572
diff
changeset
|
258 { |
32988
c3435dc00ed7
* lisp.h (KEYMAPP): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
32889
diff
changeset
|
259 if (EQ (XCAR (tem), Qkeymap)) |
25128
2563b35e613f
(get_keymap_1, get_keyelt): Check the type of OBJECT
Karl Heuer <kwzh@gnu.org>
parents:
24572
diff
changeset
|
260 return tem; |
32988
c3435dc00ed7
* lisp.h (KEYMAPP): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
32889
diff
changeset
|
261 |
c3435dc00ed7
* lisp.h (KEYMAPP): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
32889
diff
changeset
|
262 /* Should we do an autoload? Autoload forms for keymaps have |
c3435dc00ed7
* lisp.h (KEYMAPP): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
32889
diff
changeset
|
263 Qkeymap as their fifth element. */ |
57478
3965acfc4e80
(get_keymap): An autoload form is not a keymap.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
56635
diff
changeset
|
264 if ((autoload || !error) && EQ (XCAR (tem), Qautoload) |
3965acfc4e80
(get_keymap): An autoload form is not a keymap.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
56635
diff
changeset
|
265 && SYMBOLP (object)) |
1566
892c9f61217a
* keymap.c (get_keymap_1): Don't try to autoload OBJECT's function
Jim Blandy <jimb@redhat.com>
parents:
1517
diff
changeset
|
266 { |
32988
c3435dc00ed7
* lisp.h (KEYMAPP): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
32889
diff
changeset
|
267 Lisp_Object tail; |
c3435dc00ed7
* lisp.h (KEYMAPP): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
32889
diff
changeset
|
268 |
c3435dc00ed7
* lisp.h (KEYMAPP): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
32889
diff
changeset
|
269 tail = Fnth (make_number (4), tem); |
c3435dc00ed7
* lisp.h (KEYMAPP): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
32889
diff
changeset
|
270 if (EQ (tail, Qkeymap)) |
c3435dc00ed7
* lisp.h (KEYMAPP): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
32889
diff
changeset
|
271 { |
c3435dc00ed7
* lisp.h (KEYMAPP): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
32889
diff
changeset
|
272 if (autoload) |
c3435dc00ed7
* lisp.h (KEYMAPP): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
32889
diff
changeset
|
273 { |
c3435dc00ed7
* lisp.h (KEYMAPP): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
32889
diff
changeset
|
274 struct gcpro gcpro1, gcpro2; |
45279
220c13a65624
(keymap_parent): New fun, extracted from Fkeymap_parent.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
45235
diff
changeset
|
275 |
32988
c3435dc00ed7
* lisp.h (KEYMAPP): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
32889
diff
changeset
|
276 GCPRO2 (tem, object); |
c3435dc00ed7
* lisp.h (KEYMAPP): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
32889
diff
changeset
|
277 do_autoload (tem, object); |
c3435dc00ed7
* lisp.h (KEYMAPP): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
32889
diff
changeset
|
278 UNGCPRO; |
45279
220c13a65624
(keymap_parent): New fun, extracted from Fkeymap_parent.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
45235
diff
changeset
|
279 |
32988
c3435dc00ed7
* lisp.h (KEYMAPP): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
32889
diff
changeset
|
280 goto autoload_retry; |
c3435dc00ed7
* lisp.h (KEYMAPP): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
32889
diff
changeset
|
281 } |
c3435dc00ed7
* lisp.h (KEYMAPP): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
32889
diff
changeset
|
282 else |
104925
54e4fb84ea5d
(get_keymap): Return the actual keymap symbol rather than t for autoloaded
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
104922
diff
changeset
|
283 return object; |
32988
c3435dc00ed7
* lisp.h (KEYMAPP): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
32889
diff
changeset
|
284 } |
1566
892c9f61217a
* keymap.c (get_keymap_1): Don't try to autoload OBJECT's function
Jim Blandy <jimb@redhat.com>
parents:
1517
diff
changeset
|
285 } |
1517
72b7bbcaf7d8
* keymap.c (Fdefine_key, Flookup_key, describe_map): Don't assume
Jim Blandy <jimb@redhat.com>
parents:
1441
diff
changeset
|
286 } |
72b7bbcaf7d8
* keymap.c (Fdefine_key, Flookup_key, describe_map): Don't assume
Jim Blandy <jimb@redhat.com>
parents:
1441
diff
changeset
|
287 |
25128
2563b35e613f
(get_keymap_1, get_keyelt): Check the type of OBJECT
Karl Heuer <kwzh@gnu.org>
parents:
24572
diff
changeset
|
288 end: |
250 | 289 if (error) |
290 wrong_type_argument (Qkeymapp, object); | |
31829
43566b0aec59
Avoid some more compiler warnings.
Gerd Moellmann <gerd@gnu.org>
parents:
31496
diff
changeset
|
291 return Qnil; |
250 | 292 } |
15344
82615c826910
(Fkeymap_parent, Fset_keymap_parent): New functions.
Richard M. Stallman <rms@gnu.org>
parents:
14738
diff
changeset
|
293 |
45279
220c13a65624
(keymap_parent): New fun, extracted from Fkeymap_parent.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
45235
diff
changeset
|
294 /* Return the parent map of KEYMAP, or nil if it has none. |
220c13a65624
(keymap_parent): New fun, extracted from Fkeymap_parent.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
45235
diff
changeset
|
295 We assume that KEYMAP is a valid keymap. */ |
220c13a65624
(keymap_parent): New fun, extracted from Fkeymap_parent.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
45235
diff
changeset
|
296 |
220c13a65624
(keymap_parent): New fun, extracted from Fkeymap_parent.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
45235
diff
changeset
|
297 Lisp_Object |
109126
aec1143e8d85
Convert (most) functions in src to standard C.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
109100
diff
changeset
|
298 keymap_parent (Lisp_Object keymap, int autoload) |
15344
82615c826910
(Fkeymap_parent, Fset_keymap_parent): New functions.
Richard M. Stallman <rms@gnu.org>
parents:
14738
diff
changeset
|
299 { |
82615c826910
(Fkeymap_parent, Fset_keymap_parent): New functions.
Richard M. Stallman <rms@gnu.org>
parents:
14738
diff
changeset
|
300 Lisp_Object list; |
82615c826910
(Fkeymap_parent, Fset_keymap_parent): New functions.
Richard M. Stallman <rms@gnu.org>
parents:
14738
diff
changeset
|
301 |
45279
220c13a65624
(keymap_parent): New fun, extracted from Fkeymap_parent.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
45235
diff
changeset
|
302 keymap = get_keymap (keymap, 1, autoload); |
15344
82615c826910
(Fkeymap_parent, Fset_keymap_parent): New functions.
Richard M. Stallman <rms@gnu.org>
parents:
14738
diff
changeset
|
303 |
82615c826910
(Fkeymap_parent, Fset_keymap_parent): New functions.
Richard M. Stallman <rms@gnu.org>
parents:
14738
diff
changeset
|
304 /* Skip past the initial element `keymap'. */ |
25662
0a7261c1d487
Use XCAR, XCDR, and XFLOAT_DATA instead of explicit member access.
Ken Raeburn <raeburn@raeburn.org>
parents:
25600
diff
changeset
|
305 list = XCDR (keymap); |
0a7261c1d487
Use XCAR, XCDR, and XFLOAT_DATA instead of explicit member access.
Ken Raeburn <raeburn@raeburn.org>
parents:
25600
diff
changeset
|
306 for (; CONSP (list); list = XCDR (list)) |
15344
82615c826910
(Fkeymap_parent, Fset_keymap_parent): New functions.
Richard M. Stallman <rms@gnu.org>
parents:
14738
diff
changeset
|
307 { |
82615c826910
(Fkeymap_parent, Fset_keymap_parent): New functions.
Richard M. Stallman <rms@gnu.org>
parents:
14738
diff
changeset
|
308 /* See if there is another `keymap'. */ |
31208
442d40fce0db
(store_in_keymap, fix_submap_inheritance): New prototypes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
30780
diff
changeset
|
309 if (KEYMAPP (list)) |
15344
82615c826910
(Fkeymap_parent, Fset_keymap_parent): New functions.
Richard M. Stallman <rms@gnu.org>
parents:
14738
diff
changeset
|
310 return list; |
82615c826910
(Fkeymap_parent, Fset_keymap_parent): New functions.
Richard M. Stallman <rms@gnu.org>
parents:
14738
diff
changeset
|
311 } |
82615c826910
(Fkeymap_parent, Fset_keymap_parent): New functions.
Richard M. Stallman <rms@gnu.org>
parents:
14738
diff
changeset
|
312 |
45279
220c13a65624
(keymap_parent): New fun, extracted from Fkeymap_parent.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
45235
diff
changeset
|
313 return get_keymap (list, 0, autoload); |
15344
82615c826910
(Fkeymap_parent, Fset_keymap_parent): New functions.
Richard M. Stallman <rms@gnu.org>
parents:
14738
diff
changeset
|
314 } |
82615c826910
(Fkeymap_parent, Fset_keymap_parent): New functions.
Richard M. Stallman <rms@gnu.org>
parents:
14738
diff
changeset
|
315 |
45279
220c13a65624
(keymap_parent): New fun, extracted from Fkeymap_parent.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
45235
diff
changeset
|
316 DEFUN ("keymap-parent", Fkeymap_parent, Skeymap_parent, 1, 1, 0, |
102130
c78d442e47ad
(Fkeymap_parent): Doc fix (Bug#2391).
Chong Yidong <cyd@stupidchicken.com>
parents:
100951
diff
changeset
|
317 doc: /* Return the parent keymap of KEYMAP. |
c78d442e47ad
(Fkeymap_parent): Doc fix (Bug#2391).
Chong Yidong <cyd@stupidchicken.com>
parents:
100951
diff
changeset
|
318 If KEYMAP has no parent, return nil. */) |
109179
8cfee7d2955f
Convert DEFUNs to standard C.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
109165
diff
changeset
|
319 (Lisp_Object keymap) |
45279
220c13a65624
(keymap_parent): New fun, extracted from Fkeymap_parent.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
45235
diff
changeset
|
320 { |
220c13a65624
(keymap_parent): New fun, extracted from Fkeymap_parent.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
45235
diff
changeset
|
321 return keymap_parent (keymap, 1); |
220c13a65624
(keymap_parent): New fun, extracted from Fkeymap_parent.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
45235
diff
changeset
|
322 } |
31496
946e1ba42cc9
(Fset_keymap_parent): Check for cycles in keymap
Gerd Moellmann <gerd@gnu.org>
parents:
31232
diff
changeset
|
323 |
32038
0cb9cab990cb
(keymap_memberp): New function.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
31989
diff
changeset
|
324 /* Check whether MAP is one of MAPS parents. */ |
0cb9cab990cb
(keymap_memberp): New function.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
31989
diff
changeset
|
325 int |
109126
aec1143e8d85
Convert (most) functions in src to standard C.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
109100
diff
changeset
|
326 keymap_memberp (Lisp_Object map, Lisp_Object maps) |
32038
0cb9cab990cb
(keymap_memberp): New function.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
31989
diff
changeset
|
327 { |
32559
bc60bd171784
(keymap_memberp): Ensure that nil is not a member.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
32478
diff
changeset
|
328 if (NILP (map)) return 0; |
32038
0cb9cab990cb
(keymap_memberp): New function.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
31989
diff
changeset
|
329 while (KEYMAPP (maps) && !EQ (map, maps)) |
45279
220c13a65624
(keymap_parent): New fun, extracted from Fkeymap_parent.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
45235
diff
changeset
|
330 maps = keymap_parent (maps, 0); |
32038
0cb9cab990cb
(keymap_memberp): New function.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
31989
diff
changeset
|
331 return (EQ (map, maps)); |
0cb9cab990cb
(keymap_memberp): New function.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
31989
diff
changeset
|
332 } |
0cb9cab990cb
(keymap_memberp): New function.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
31989
diff
changeset
|
333 |
15344
82615c826910
(Fkeymap_parent, Fset_keymap_parent): New functions.
Richard M. Stallman <rms@gnu.org>
parents:
14738
diff
changeset
|
334 /* Set the parent keymap of MAP to PARENT. */ |
82615c826910
(Fkeymap_parent, Fset_keymap_parent): New functions.
Richard M. Stallman <rms@gnu.org>
parents:
14738
diff
changeset
|
335 |
82615c826910
(Fkeymap_parent, Fset_keymap_parent): New functions.
Richard M. Stallman <rms@gnu.org>
parents:
14738
diff
changeset
|
336 DEFUN ("set-keymap-parent", Fset_keymap_parent, Sset_keymap_parent, 2, 2, 0, |
41001
a17c8b15ef1b
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
40804
diff
changeset
|
337 doc: /* Modify KEYMAP to set its parent map to PARENT. |
56574
c6f24a7d73bd
(Fset_keymap_parent): Minor doc fix.
Luc Teirlinck <teirllm@auburn.edu>
parents:
56573
diff
changeset
|
338 Return PARENT. PARENT should be nil or another keymap. */) |
109179
8cfee7d2955f
Convert DEFUNs to standard C.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
109165
diff
changeset
|
339 (Lisp_Object keymap, Lisp_Object parent) |
15344
82615c826910
(Fkeymap_parent, Fset_keymap_parent): New functions.
Richard M. Stallman <rms@gnu.org>
parents:
14738
diff
changeset
|
340 { |
82615c826910
(Fkeymap_parent, Fset_keymap_parent): New functions.
Richard M. Stallman <rms@gnu.org>
parents:
14738
diff
changeset
|
341 Lisp_Object list, prev; |
45279
220c13a65624
(keymap_parent): New fun, extracted from Fkeymap_parent.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
45235
diff
changeset
|
342 struct gcpro gcpro1, gcpro2; |
15344
82615c826910
(Fkeymap_parent, Fset_keymap_parent): New functions.
Richard M. Stallman <rms@gnu.org>
parents:
14738
diff
changeset
|
343 int i; |
82615c826910
(Fkeymap_parent, Fset_keymap_parent): New functions.
Richard M. Stallman <rms@gnu.org>
parents:
14738
diff
changeset
|
344 |
32889
673e3ef1f7f6
(where_is_cache, where_is_cache_keymaps): New vars.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
32846
diff
changeset
|
345 /* Force a keymap flush for the next call to where-is. |
673e3ef1f7f6
(where_is_cache, where_is_cache_keymaps): New vars.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
32846
diff
changeset
|
346 Since this can be called from within where-is, we don't set where_is_cache |
673e3ef1f7f6
(where_is_cache, where_is_cache_keymaps): New vars.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
32846
diff
changeset
|
347 directly but only where_is_cache_keymaps, since where_is_cache shouldn't |
673e3ef1f7f6
(where_is_cache, where_is_cache_keymaps): New vars.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
32846
diff
changeset
|
348 be changed during where-is, while where_is_cache_keymaps is only used at |
673e3ef1f7f6
(where_is_cache, where_is_cache_keymaps): New vars.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
32846
diff
changeset
|
349 the very beginning of where-is and can thus be changed here without any |
673e3ef1f7f6
(where_is_cache, where_is_cache_keymaps): New vars.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
32846
diff
changeset
|
350 adverse effect. |
673e3ef1f7f6
(where_is_cache, where_is_cache_keymaps): New vars.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
32846
diff
changeset
|
351 This is a very minor correctness (rather than safety) issue. */ |
673e3ef1f7f6
(where_is_cache, where_is_cache_keymaps): New vars.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
32846
diff
changeset
|
352 where_is_cache_keymaps = Qt; |
673e3ef1f7f6
(where_is_cache, where_is_cache_keymaps): New vars.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
32846
diff
changeset
|
353 |
45279
220c13a65624
(keymap_parent): New fun, extracted from Fkeymap_parent.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
45235
diff
changeset
|
354 GCPRO2 (keymap, parent); |
32988
c3435dc00ed7
* lisp.h (KEYMAPP): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
32889
diff
changeset
|
355 keymap = get_keymap (keymap, 1, 1); |
45279
220c13a65624
(keymap_parent): New fun, extracted from Fkeymap_parent.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
45235
diff
changeset
|
356 |
15344
82615c826910
(Fkeymap_parent, Fset_keymap_parent): New functions.
Richard M. Stallman <rms@gnu.org>
parents:
14738
diff
changeset
|
357 if (!NILP (parent)) |
31496
946e1ba42cc9
(Fset_keymap_parent): Check for cycles in keymap
Gerd Moellmann <gerd@gnu.org>
parents:
31232
diff
changeset
|
358 { |
32988
c3435dc00ed7
* lisp.h (KEYMAPP): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
32889
diff
changeset
|
359 parent = get_keymap (parent, 1, 1); |
31496
946e1ba42cc9
(Fset_keymap_parent): Check for cycles in keymap
Gerd Moellmann <gerd@gnu.org>
parents:
31232
diff
changeset
|
360 |
946e1ba42cc9
(Fset_keymap_parent): Check for cycles in keymap
Gerd Moellmann <gerd@gnu.org>
parents:
31232
diff
changeset
|
361 /* Check for cycles. */ |
32038
0cb9cab990cb
(keymap_memberp): New function.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
31989
diff
changeset
|
362 if (keymap_memberp (keymap, parent)) |
31496
946e1ba42cc9
(Fset_keymap_parent): Check for cycles in keymap
Gerd Moellmann <gerd@gnu.org>
parents:
31232
diff
changeset
|
363 error ("Cyclic keymap inheritance"); |
946e1ba42cc9
(Fset_keymap_parent): Check for cycles in keymap
Gerd Moellmann <gerd@gnu.org>
parents:
31232
diff
changeset
|
364 } |
15344
82615c826910
(Fkeymap_parent, Fset_keymap_parent): New functions.
Richard M. Stallman <rms@gnu.org>
parents:
14738
diff
changeset
|
365 |
82615c826910
(Fkeymap_parent, Fset_keymap_parent): New functions.
Richard M. Stallman <rms@gnu.org>
parents:
14738
diff
changeset
|
366 /* Skip past the initial element `keymap'. */ |
82615c826910
(Fkeymap_parent, Fset_keymap_parent): New functions.
Richard M. Stallman <rms@gnu.org>
parents:
14738
diff
changeset
|
367 prev = keymap; |
82615c826910
(Fkeymap_parent, Fset_keymap_parent): New functions.
Richard M. Stallman <rms@gnu.org>
parents:
14738
diff
changeset
|
368 while (1) |
82615c826910
(Fkeymap_parent, Fset_keymap_parent): New functions.
Richard M. Stallman <rms@gnu.org>
parents:
14738
diff
changeset
|
369 { |
25662
0a7261c1d487
Use XCAR, XCDR, and XFLOAT_DATA instead of explicit member access.
Ken Raeburn <raeburn@raeburn.org>
parents:
25600
diff
changeset
|
370 list = XCDR (prev); |
15344
82615c826910
(Fkeymap_parent, Fset_keymap_parent): New functions.
Richard M. Stallman <rms@gnu.org>
parents:
14738
diff
changeset
|
371 /* If there is a parent keymap here, replace it. |
82615c826910
(Fkeymap_parent, Fset_keymap_parent): New functions.
Richard M. Stallman <rms@gnu.org>
parents:
14738
diff
changeset
|
372 If we came to the end, add the parent in PREV. */ |
39689
0572449a62be
(Fkeymap_prompt, Fcurrent_active_maps): New funs.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
39682
diff
changeset
|
373 if (!CONSP (list) || KEYMAPP (list)) |
15344
82615c826910
(Fkeymap_parent, Fset_keymap_parent): New functions.
Richard M. Stallman <rms@gnu.org>
parents:
14738
diff
changeset
|
374 { |
15422
dd639432a55a
(Fset_keymap_parent): Return early if KEYMAP already has the proper parent.
Richard M. Stallman <rms@gnu.org>
parents:
15378
diff
changeset
|
375 /* If we already have the right parent, return now |
dd639432a55a
(Fset_keymap_parent): Return early if KEYMAP already has the proper parent.
Richard M. Stallman <rms@gnu.org>
parents:
15378
diff
changeset
|
376 so that we avoid the loops below. */ |
25662
0a7261c1d487
Use XCAR, XCDR, and XFLOAT_DATA instead of explicit member access.
Ken Raeburn <raeburn@raeburn.org>
parents:
25600
diff
changeset
|
377 if (EQ (XCDR (prev), parent)) |
30134
784ef95b020b
(get_keymap_1): Add comment that this function can GC.
Gerd Moellmann <gerd@gnu.org>
parents:
30030
diff
changeset
|
378 RETURN_UNGCPRO (parent); |
15422
dd639432a55a
(Fset_keymap_parent): Return early if KEYMAP already has the proper parent.
Richard M. Stallman <rms@gnu.org>
parents:
15378
diff
changeset
|
379 |
67505
51053176f6b7
(Fset_keymap_parent, store_in_keymap): Use CHECK_IMPURE.
Richard M. Stallman <rms@gnu.org>
parents:
67259
diff
changeset
|
380 CHECK_IMPURE (prev); |
39973
579177964efa
Avoid (most) uses of XCAR/XCDR as lvalues, for flexibility in experimenting
Ken Raeburn <raeburn@raeburn.org>
parents:
39940
diff
changeset
|
381 XSETCDR (prev, parent); |
15344
82615c826910
(Fkeymap_parent, Fset_keymap_parent): New functions.
Richard M. Stallman <rms@gnu.org>
parents:
14738
diff
changeset
|
382 break; |
82615c826910
(Fkeymap_parent, Fset_keymap_parent): New functions.
Richard M. Stallman <rms@gnu.org>
parents:
14738
diff
changeset
|
383 } |
82615c826910
(Fkeymap_parent, Fset_keymap_parent): New functions.
Richard M. Stallman <rms@gnu.org>
parents:
14738
diff
changeset
|
384 prev = list; |
82615c826910
(Fkeymap_parent, Fset_keymap_parent): New functions.
Richard M. Stallman <rms@gnu.org>
parents:
14738
diff
changeset
|
385 } |
82615c826910
(Fkeymap_parent, Fset_keymap_parent): New functions.
Richard M. Stallman <rms@gnu.org>
parents:
14738
diff
changeset
|
386 |
82615c826910
(Fkeymap_parent, Fset_keymap_parent): New functions.
Richard M. Stallman <rms@gnu.org>
parents:
14738
diff
changeset
|
387 /* Scan through for submaps, and set their parents too. */ |
82615c826910
(Fkeymap_parent, Fset_keymap_parent): New functions.
Richard M. Stallman <rms@gnu.org>
parents:
14738
diff
changeset
|
388 |
25662
0a7261c1d487
Use XCAR, XCDR, and XFLOAT_DATA instead of explicit member access.
Ken Raeburn <raeburn@raeburn.org>
parents:
25600
diff
changeset
|
389 for (list = XCDR (keymap); CONSP (list); list = XCDR (list)) |
15344
82615c826910
(Fkeymap_parent, Fset_keymap_parent): New functions.
Richard M. Stallman <rms@gnu.org>
parents:
14738
diff
changeset
|
390 { |
82615c826910
(Fkeymap_parent, Fset_keymap_parent): New functions.
Richard M. Stallman <rms@gnu.org>
parents:
14738
diff
changeset
|
391 /* Stop the scan when we come to the parent. */ |
25662
0a7261c1d487
Use XCAR, XCDR, and XFLOAT_DATA instead of explicit member access.
Ken Raeburn <raeburn@raeburn.org>
parents:
25600
diff
changeset
|
392 if (EQ (XCAR (list), Qkeymap)) |
15344
82615c826910
(Fkeymap_parent, Fset_keymap_parent): New functions.
Richard M. Stallman <rms@gnu.org>
parents:
14738
diff
changeset
|
393 break; |
82615c826910
(Fkeymap_parent, Fset_keymap_parent): New functions.
Richard M. Stallman <rms@gnu.org>
parents:
14738
diff
changeset
|
394 |
82615c826910
(Fkeymap_parent, Fset_keymap_parent): New functions.
Richard M. Stallman <rms@gnu.org>
parents:
14738
diff
changeset
|
395 /* If this element holds a prefix map, deal with it. */ |
25662
0a7261c1d487
Use XCAR, XCDR, and XFLOAT_DATA instead of explicit member access.
Ken Raeburn <raeburn@raeburn.org>
parents:
25600
diff
changeset
|
396 if (CONSP (XCAR (list)) |
0a7261c1d487
Use XCAR, XCDR, and XFLOAT_DATA instead of explicit member access.
Ken Raeburn <raeburn@raeburn.org>
parents:
25600
diff
changeset
|
397 && CONSP (XCDR (XCAR (list)))) |
0a7261c1d487
Use XCAR, XCDR, and XFLOAT_DATA instead of explicit member access.
Ken Raeburn <raeburn@raeburn.org>
parents:
25600
diff
changeset
|
398 fix_submap_inheritance (keymap, XCAR (XCAR (list)), |
0a7261c1d487
Use XCAR, XCDR, and XFLOAT_DATA instead of explicit member access.
Ken Raeburn <raeburn@raeburn.org>
parents:
25600
diff
changeset
|
399 XCDR (XCAR (list))); |
0a7261c1d487
Use XCAR, XCDR, and XFLOAT_DATA instead of explicit member access.
Ken Raeburn <raeburn@raeburn.org>
parents:
25600
diff
changeset
|
400 |
0a7261c1d487
Use XCAR, XCDR, and XFLOAT_DATA instead of explicit member access.
Ken Raeburn <raeburn@raeburn.org>
parents:
25600
diff
changeset
|
401 if (VECTORP (XCAR (list))) |
0a7261c1d487
Use XCAR, XCDR, and XFLOAT_DATA instead of explicit member access.
Ken Raeburn <raeburn@raeburn.org>
parents:
25600
diff
changeset
|
402 for (i = 0; i < XVECTOR (XCAR (list))->size; i++) |
0a7261c1d487
Use XCAR, XCDR, and XFLOAT_DATA instead of explicit member access.
Ken Raeburn <raeburn@raeburn.org>
parents:
25600
diff
changeset
|
403 if (CONSP (XVECTOR (XCAR (list))->contents[i])) |
15344
82615c826910
(Fkeymap_parent, Fset_keymap_parent): New functions.
Richard M. Stallman <rms@gnu.org>
parents:
14738
diff
changeset
|
404 fix_submap_inheritance (keymap, make_number (i), |
25662
0a7261c1d487
Use XCAR, XCDR, and XFLOAT_DATA instead of explicit member access.
Ken Raeburn <raeburn@raeburn.org>
parents:
25600
diff
changeset
|
405 XVECTOR (XCAR (list))->contents[i]); |
0a7261c1d487
Use XCAR, XCDR, and XFLOAT_DATA instead of explicit member access.
Ken Raeburn <raeburn@raeburn.org>
parents:
25600
diff
changeset
|
406 |
0a7261c1d487
Use XCAR, XCDR, and XFLOAT_DATA instead of explicit member access.
Ken Raeburn <raeburn@raeburn.org>
parents:
25600
diff
changeset
|
407 if (CHAR_TABLE_P (XCAR (list))) |
17788
208d71ea3a4f
(get_keyelt): Handle an indirect entry with meta char.
Richard M. Stallman <rms@gnu.org>
parents:
17511
diff
changeset
|
408 { |
89551
28a8f2be4414
(Fset_keymap_parent, map_keymap, Fcopy_keymap)
Dave Love <fx@gnu.org>
parents:
89483
diff
changeset
|
409 map_char_table (fix_submap_inheritance, Qnil, XCAR (list), keymap); |
17788
208d71ea3a4f
(get_keyelt): Handle an indirect entry with meta char.
Richard M. Stallman <rms@gnu.org>
parents:
17511
diff
changeset
|
410 } |
15344
82615c826910
(Fkeymap_parent, Fset_keymap_parent): New functions.
Richard M. Stallman <rms@gnu.org>
parents:
14738
diff
changeset
|
411 } |
82615c826910
(Fkeymap_parent, Fset_keymap_parent): New functions.
Richard M. Stallman <rms@gnu.org>
parents:
14738
diff
changeset
|
412 |
30134
784ef95b020b
(get_keymap_1): Add comment that this function can GC.
Gerd Moellmann <gerd@gnu.org>
parents:
30030
diff
changeset
|
413 RETURN_UNGCPRO (parent); |
15344
82615c826910
(Fkeymap_parent, Fset_keymap_parent): New functions.
Richard M. Stallman <rms@gnu.org>
parents:
14738
diff
changeset
|
414 } |
82615c826910
(Fkeymap_parent, Fset_keymap_parent): New functions.
Richard M. Stallman <rms@gnu.org>
parents:
14738
diff
changeset
|
415 |
82615c826910
(Fkeymap_parent, Fset_keymap_parent): New functions.
Richard M. Stallman <rms@gnu.org>
parents:
14738
diff
changeset
|
416 /* EVENT is defined in MAP as a prefix, and SUBMAP is its definition. |
82615c826910
(Fkeymap_parent, Fset_keymap_parent): New functions.
Richard M. Stallman <rms@gnu.org>
parents:
14738
diff
changeset
|
417 if EVENT is also a prefix in MAP's parent, |
82615c826910
(Fkeymap_parent, Fset_keymap_parent): New functions.
Richard M. Stallman <rms@gnu.org>
parents:
14738
diff
changeset
|
418 make sure that SUBMAP inherits that definition as its own parent. */ |
82615c826910
(Fkeymap_parent, Fset_keymap_parent): New functions.
Richard M. Stallman <rms@gnu.org>
parents:
14738
diff
changeset
|
419 |
31208
442d40fce0db
(store_in_keymap, fix_submap_inheritance): New prototypes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
30780
diff
changeset
|
420 static void |
109126
aec1143e8d85
Convert (most) functions in src to standard C.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
109100
diff
changeset
|
421 fix_submap_inheritance (Lisp_Object map, Lisp_Object event, Lisp_Object submap) |
15344
82615c826910
(Fkeymap_parent, Fset_keymap_parent): New functions.
Richard M. Stallman <rms@gnu.org>
parents:
14738
diff
changeset
|
422 { |
82615c826910
(Fkeymap_parent, Fset_keymap_parent): New functions.
Richard M. Stallman <rms@gnu.org>
parents:
14738
diff
changeset
|
423 Lisp_Object map_parent, parent_entry; |
82615c826910
(Fkeymap_parent, Fset_keymap_parent): New functions.
Richard M. Stallman <rms@gnu.org>
parents:
14738
diff
changeset
|
424 |
82615c826910
(Fkeymap_parent, Fset_keymap_parent): New functions.
Richard M. Stallman <rms@gnu.org>
parents:
14738
diff
changeset
|
425 /* SUBMAP is a cons that we found as a key binding. |
82615c826910
(Fkeymap_parent, Fset_keymap_parent): New functions.
Richard M. Stallman <rms@gnu.org>
parents:
14738
diff
changeset
|
426 Discard the other things found in a menu key binding. */ |
82615c826910
(Fkeymap_parent, Fset_keymap_parent): New functions.
Richard M. Stallman <rms@gnu.org>
parents:
14738
diff
changeset
|
427 |
32988
c3435dc00ed7
* lisp.h (KEYMAPP): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
32889
diff
changeset
|
428 submap = get_keymap (get_keyelt (submap, 0), 0, 0); |
15344
82615c826910
(Fkeymap_parent, Fset_keymap_parent): New functions.
Richard M. Stallman <rms@gnu.org>
parents:
14738
diff
changeset
|
429 |
82615c826910
(Fkeymap_parent, Fset_keymap_parent): New functions.
Richard M. Stallman <rms@gnu.org>
parents:
14738
diff
changeset
|
430 /* If it isn't a keymap now, there's no work to do. */ |
32988
c3435dc00ed7
* lisp.h (KEYMAPP): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
32889
diff
changeset
|
431 if (!CONSP (submap)) |
15344
82615c826910
(Fkeymap_parent, Fset_keymap_parent): New functions.
Richard M. Stallman <rms@gnu.org>
parents:
14738
diff
changeset
|
432 return; |
82615c826910
(Fkeymap_parent, Fset_keymap_parent): New functions.
Richard M. Stallman <rms@gnu.org>
parents:
14738
diff
changeset
|
433 |
45279
220c13a65624
(keymap_parent): New fun, extracted from Fkeymap_parent.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
45235
diff
changeset
|
434 map_parent = keymap_parent (map, 0); |
32988
c3435dc00ed7
* lisp.h (KEYMAPP): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
32889
diff
changeset
|
435 if (!NILP (map_parent)) |
32844
5aa0846c2995
(fix_submap_inheritance): Use get_keymap_1 on parent_entry
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
32818
diff
changeset
|
436 parent_entry = |
32988
c3435dc00ed7
* lisp.h (KEYMAPP): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
32889
diff
changeset
|
437 get_keymap (access_keymap (map_parent, event, 0, 0, 0), 0, 0); |
15344
82615c826910
(Fkeymap_parent, Fset_keymap_parent): New functions.
Richard M. Stallman <rms@gnu.org>
parents:
14738
diff
changeset
|
438 else |
82615c826910
(Fkeymap_parent, Fset_keymap_parent): New functions.
Richard M. Stallman <rms@gnu.org>
parents:
14738
diff
changeset
|
439 parent_entry = Qnil; |
82615c826910
(Fkeymap_parent, Fset_keymap_parent): New functions.
Richard M. Stallman <rms@gnu.org>
parents:
14738
diff
changeset
|
440 |
15378
ecfc288350ab
(fix_submap_inheritance): If parent_entry is not a keymap, use nil instead.
Richard M. Stallman <rms@gnu.org>
parents:
15344
diff
changeset
|
441 /* If MAP's parent has something other than a keymap, |
32739
5ce157b2eaa9
(fix_submap_inheritance): Don't do anything if parent_entry
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
32615
diff
changeset
|
442 our own submap shadows it completely. */ |
32988
c3435dc00ed7
* lisp.h (KEYMAPP): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
32889
diff
changeset
|
443 if (!CONSP (parent_entry)) |
32739
5ce157b2eaa9
(fix_submap_inheritance): Don't do anything if parent_entry
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
32615
diff
changeset
|
444 return; |
15378
ecfc288350ab
(fix_submap_inheritance): If parent_entry is not a keymap, use nil instead.
Richard M. Stallman <rms@gnu.org>
parents:
15344
diff
changeset
|
445 |
15344
82615c826910
(Fkeymap_parent, Fset_keymap_parent): New functions.
Richard M. Stallman <rms@gnu.org>
parents:
14738
diff
changeset
|
446 if (! EQ (parent_entry, submap)) |
25600
6cea4c28fc1c
(fix_submap_inheritance): Do nothing if the proper parent is an
Richard M. Stallman <rms@gnu.org>
parents:
25128
diff
changeset
|
447 { |
6cea4c28fc1c
(fix_submap_inheritance): Do nothing if the proper parent is an
Richard M. Stallman <rms@gnu.org>
parents:
25128
diff
changeset
|
448 Lisp_Object submap_parent; |
6cea4c28fc1c
(fix_submap_inheritance): Do nothing if the proper parent is an
Richard M. Stallman <rms@gnu.org>
parents:
25128
diff
changeset
|
449 submap_parent = submap; |
6cea4c28fc1c
(fix_submap_inheritance): Do nothing if the proper parent is an
Richard M. Stallman <rms@gnu.org>
parents:
25128
diff
changeset
|
450 while (1) |
6cea4c28fc1c
(fix_submap_inheritance): Do nothing if the proper parent is an
Richard M. Stallman <rms@gnu.org>
parents:
25128
diff
changeset
|
451 { |
6cea4c28fc1c
(fix_submap_inheritance): Do nothing if the proper parent is an
Richard M. Stallman <rms@gnu.org>
parents:
25128
diff
changeset
|
452 Lisp_Object tem; |
32739
5ce157b2eaa9
(fix_submap_inheritance): Don't do anything if parent_entry
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
32615
diff
changeset
|
453 |
45279
220c13a65624
(keymap_parent): New fun, extracted from Fkeymap_parent.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
45235
diff
changeset
|
454 tem = keymap_parent (submap_parent, 0); |
32739
5ce157b2eaa9
(fix_submap_inheritance): Don't do anything if parent_entry
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
32615
diff
changeset
|
455 |
5ce157b2eaa9
(fix_submap_inheritance): Don't do anything if parent_entry
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
32615
diff
changeset
|
456 if (KEYMAPP (tem)) |
5ce157b2eaa9
(fix_submap_inheritance): Don't do anything if parent_entry
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
32615
diff
changeset
|
457 { |
5ce157b2eaa9
(fix_submap_inheritance): Don't do anything if parent_entry
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
32615
diff
changeset
|
458 if (keymap_memberp (tem, parent_entry)) |
5ce157b2eaa9
(fix_submap_inheritance): Don't do anything if parent_entry
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
32615
diff
changeset
|
459 /* Fset_keymap_parent could create a cycle. */ |
5ce157b2eaa9
(fix_submap_inheritance): Don't do anything if parent_entry
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
32615
diff
changeset
|
460 return; |
5ce157b2eaa9
(fix_submap_inheritance): Don't do anything if parent_entry
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
32615
diff
changeset
|
461 submap_parent = tem; |
5ce157b2eaa9
(fix_submap_inheritance): Don't do anything if parent_entry
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
32615
diff
changeset
|
462 } |
25600
6cea4c28fc1c
(fix_submap_inheritance): Do nothing if the proper parent is an
Richard M. Stallman <rms@gnu.org>
parents:
25128
diff
changeset
|
463 else |
6cea4c28fc1c
(fix_submap_inheritance): Do nothing if the proper parent is an
Richard M. Stallman <rms@gnu.org>
parents:
25128
diff
changeset
|
464 break; |
6cea4c28fc1c
(fix_submap_inheritance): Do nothing if the proper parent is an
Richard M. Stallman <rms@gnu.org>
parents:
25128
diff
changeset
|
465 } |
6cea4c28fc1c
(fix_submap_inheritance): Do nothing if the proper parent is an
Richard M. Stallman <rms@gnu.org>
parents:
25128
diff
changeset
|
466 Fset_keymap_parent (submap_parent, parent_entry); |
6cea4c28fc1c
(fix_submap_inheritance): Do nothing if the proper parent is an
Richard M. Stallman <rms@gnu.org>
parents:
25128
diff
changeset
|
467 } |
15344
82615c826910
(Fkeymap_parent, Fset_keymap_parent): New functions.
Richard M. Stallman <rms@gnu.org>
parents:
14738
diff
changeset
|
468 } |
82615c826910
(Fkeymap_parent, Fset_keymap_parent): New functions.
Richard M. Stallman <rms@gnu.org>
parents:
14738
diff
changeset
|
469 |
1209
1aa2cd425737
* keymap.c (DENSE_TABLE_SIZE): Doc fix.
Jim Blandy <jimb@redhat.com>
parents:
1160
diff
changeset
|
470 /* Look up IDX in MAP. IDX may be any sort of event. |
1aa2cd425737
* keymap.c (DENSE_TABLE_SIZE): Doc fix.
Jim Blandy <jimb@redhat.com>
parents:
1160
diff
changeset
|
471 Note that this does only one level of lookup; IDX must be a single |
45619
dbd65bd8bb4f
(describe_command): Cast `current_column' return value to int.
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
45404
diff
changeset
|
472 event, not a sequence. |
1388
02226bff1476
* keymap.c (initial_define_lispy_key): New function, for defining
Jim Blandy <jimb@redhat.com>
parents:
1315
diff
changeset
|
473 |
02226bff1476
* keymap.c (initial_define_lispy_key): New function, for defining
Jim Blandy <jimb@redhat.com>
parents:
1315
diff
changeset
|
474 If T_OK is non-zero, bindings for Qt are treated as default |
02226bff1476
* keymap.c (initial_define_lispy_key): New function, for defining
Jim Blandy <jimb@redhat.com>
parents:
1315
diff
changeset
|
475 bindings; any key left unmentioned by other tables and bindings is |
45619
dbd65bd8bb4f
(describe_command): Cast `current_column' return value to int.
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
45404
diff
changeset
|
476 given the binding of Qt. |
1388
02226bff1476
* keymap.c (initial_define_lispy_key): New function, for defining
Jim Blandy <jimb@redhat.com>
parents:
1315
diff
changeset
|
477 |
3735
7193a99a87c1
Make prefix keys work with keymap inheritance
Richard M. Stallman <rms@gnu.org>
parents:
3691
diff
changeset
|
478 If T_OK is zero, bindings for Qt are not treated specially. |
7193a99a87c1
Make prefix keys work with keymap inheritance
Richard M. Stallman <rms@gnu.org>
parents:
3691
diff
changeset
|
479 |
7193a99a87c1
Make prefix keys work with keymap inheritance
Richard M. Stallman <rms@gnu.org>
parents:
3691
diff
changeset
|
480 If NOINHERIT, don't accept a subkeymap found in an inherited keymap. */ |
250 | 481 |
482 Lisp_Object | |
109126
aec1143e8d85
Convert (most) functions in src to standard C.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
109100
diff
changeset
|
483 access_keymap (Lisp_Object map, Lisp_Object idx, int t_ok, int noinherit, int autoload) |
250 | 484 { |
40791
97673fa0eaa7
(access_keymap): Don't use initializers on Lisp_Object.
Richard M. Stallman <rms@gnu.org>
parents:
40656
diff
changeset
|
485 Lisp_Object val; |
97673fa0eaa7
(access_keymap): Don't use initializers on Lisp_Object.
Richard M. Stallman <rms@gnu.org>
parents:
40656
diff
changeset
|
486 |
97673fa0eaa7
(access_keymap): Don't use initializers on Lisp_Object.
Richard M. Stallman <rms@gnu.org>
parents:
40656
diff
changeset
|
487 /* Qunbound in VAL means we have found no binding yet. */ |
97673fa0eaa7
(access_keymap): Don't use initializers on Lisp_Object.
Richard M. Stallman <rms@gnu.org>
parents:
40656
diff
changeset
|
488 val = Qunbound; |
3735
7193a99a87c1
Make prefix keys work with keymap inheritance
Richard M. Stallman <rms@gnu.org>
parents:
3691
diff
changeset
|
489 |
250 | 490 /* If idx is a list (some sort of mouse click, perhaps?), |
491 the index we want to use is the car of the list, which | |
492 ought to be a symbol. */ | |
1315
884c3d7e7172
* keymap.c (access_keymap, store_in_keymap,
Jim Blandy <jimb@redhat.com>
parents:
1264
diff
changeset
|
493 idx = EVENT_HEAD (idx); |
250 | 494 |
1209
1aa2cd425737
* keymap.c (DENSE_TABLE_SIZE): Doc fix.
Jim Blandy <jimb@redhat.com>
parents:
1160
diff
changeset
|
495 /* If idx is a symbol, it might have modifiers, which need to |
1aa2cd425737
* keymap.c (DENSE_TABLE_SIZE): Doc fix.
Jim Blandy <jimb@redhat.com>
parents:
1160
diff
changeset
|
496 be put in the canonical order. */ |
8866
48a0ea73a9d7
(Fkey_description): Give error if KEYS not an array.
Richard M. Stallman <rms@gnu.org>
parents:
8731
diff
changeset
|
497 if (SYMBOLP (idx)) |
1209
1aa2cd425737
* keymap.c (DENSE_TABLE_SIZE): Doc fix.
Jim Blandy <jimb@redhat.com>
parents:
1160
diff
changeset
|
498 idx = reorder_modifiers (idx); |
3515
9d0af0f2dc0d
(access_keymap, store_in_keymap): Discard meaningless
Richard M. Stallman <rms@gnu.org>
parents:
3425
diff
changeset
|
499 else if (INTEGERP (idx)) |
9d0af0f2dc0d
(access_keymap, store_in_keymap): Discard meaningless
Richard M. Stallman <rms@gnu.org>
parents:
3425
diff
changeset
|
500 /* Clobber the high bits that can be present on a machine |
9d0af0f2dc0d
(access_keymap, store_in_keymap): Discard meaningless
Richard M. Stallman <rms@gnu.org>
parents:
3425
diff
changeset
|
501 with more than 24 bits of integer. */ |
9312
dfaf1d41e53d
(synkey, access_keymap, store_in_keymap, Faccessible_keymaps,
Karl Heuer <kwzh@gnu.org>
parents:
9273
diff
changeset
|
502 XSETFASTINT (idx, XINT (idx) & (CHAR_META | (CHAR_META - 1))); |
250 | 503 |
32476
9b2a0dc393a4
* keymap.c (access_keymap): Add AUTOLOAD parameter.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
32145
diff
changeset
|
504 /* Handle the special meta -> esc mapping. */ |
9b2a0dc393a4
* keymap.c (access_keymap): Add AUTOLOAD parameter.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
32145
diff
changeset
|
505 if (INTEGERP (idx) && XUINT (idx) & meta_modifier) |
9b2a0dc393a4
* keymap.c (access_keymap): Add AUTOLOAD parameter.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
32145
diff
changeset
|
506 { |
32615
5f6178a60e6b
(access_keymap): If IDX has a meta prefix, and there's
Gerd Moellmann <gerd@gnu.org>
parents:
32559
diff
changeset
|
507 /* See if there is a meta-map. If there's none, there is |
5f6178a60e6b
(access_keymap): If IDX has a meta prefix, and there's
Gerd Moellmann <gerd@gnu.org>
parents:
32559
diff
changeset
|
508 no binding for IDX, unless a default binding exists in MAP. */ |
45279
220c13a65624
(keymap_parent): New fun, extracted from Fkeymap_parent.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
45235
diff
changeset
|
509 struct gcpro gcpro1; |
220c13a65624
(keymap_parent): New fun, extracted from Fkeymap_parent.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
45235
diff
changeset
|
510 Lisp_Object meta_map; |
220c13a65624
(keymap_parent): New fun, extracted from Fkeymap_parent.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
45235
diff
changeset
|
511 GCPRO1 (map); |
59661
e7a8549bb201
(access_keymap): Protect from bad value of meta_prefix_char.
Richard M. Stallman <rms@gnu.org>
parents:
59522
diff
changeset
|
512 /* A strange value in which Meta is set would cause |
e7a8549bb201
(access_keymap): Protect from bad value of meta_prefix_char.
Richard M. Stallman <rms@gnu.org>
parents:
59522
diff
changeset
|
513 infinite recursion. Protect against that. */ |
59754
a9fbaec66c84
(access_keymap): YAILOM.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
59661
diff
changeset
|
514 if (XINT (meta_prefix_char) & CHAR_META) |
59661
e7a8549bb201
(access_keymap): Protect from bad value of meta_prefix_char.
Richard M. Stallman <rms@gnu.org>
parents:
59522
diff
changeset
|
515 meta_prefix_char = make_number (27); |
45279
220c13a65624
(keymap_parent): New fun, extracted from Fkeymap_parent.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
45235
diff
changeset
|
516 meta_map = get_keymap (access_keymap (map, meta_prefix_char, |
220c13a65624
(keymap_parent): New fun, extracted from Fkeymap_parent.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
45235
diff
changeset
|
517 t_ok, noinherit, autoload), |
220c13a65624
(keymap_parent): New fun, extracted from Fkeymap_parent.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
45235
diff
changeset
|
518 0, autoload); |
220c13a65624
(keymap_parent): New fun, extracted from Fkeymap_parent.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
45235
diff
changeset
|
519 UNGCPRO; |
32988
c3435dc00ed7
* lisp.h (KEYMAPP): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
32889
diff
changeset
|
520 if (CONSP (meta_map)) |
32615
5f6178a60e6b
(access_keymap): If IDX has a meta prefix, and there's
Gerd Moellmann <gerd@gnu.org>
parents:
32559
diff
changeset
|
521 { |
32739
5ce157b2eaa9
(fix_submap_inheritance): Don't do anything if parent_entry
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
32615
diff
changeset
|
522 map = meta_map; |
32615
5f6178a60e6b
(access_keymap): If IDX has a meta prefix, and there's
Gerd Moellmann <gerd@gnu.org>
parents:
32559
diff
changeset
|
523 idx = make_number (XUINT (idx) & ~meta_modifier); |
5f6178a60e6b
(access_keymap): If IDX has a meta prefix, and there's
Gerd Moellmann <gerd@gnu.org>
parents:
32559
diff
changeset
|
524 } |
5f6178a60e6b
(access_keymap): If IDX has a meta prefix, and there's
Gerd Moellmann <gerd@gnu.org>
parents:
32559
diff
changeset
|
525 else if (t_ok) |
5f6178a60e6b
(access_keymap): If IDX has a meta prefix, and there's
Gerd Moellmann <gerd@gnu.org>
parents:
32559
diff
changeset
|
526 /* Set IDX to t, so that we only find a default binding. */ |
5f6178a60e6b
(access_keymap): If IDX has a meta prefix, and there's
Gerd Moellmann <gerd@gnu.org>
parents:
32559
diff
changeset
|
527 idx = Qt; |
5f6178a60e6b
(access_keymap): If IDX has a meta prefix, and there's
Gerd Moellmann <gerd@gnu.org>
parents:
32559
diff
changeset
|
528 else |
5f6178a60e6b
(access_keymap): If IDX has a meta prefix, and there's
Gerd Moellmann <gerd@gnu.org>
parents:
32559
diff
changeset
|
529 /* We know there is no binding. */ |
5f6178a60e6b
(access_keymap): If IDX has a meta prefix, and there's
Gerd Moellmann <gerd@gnu.org>
parents:
32559
diff
changeset
|
530 return Qnil; |
32476
9b2a0dc393a4
* keymap.c (access_keymap): Add AUTOLOAD parameter.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
32145
diff
changeset
|
531 } |
9b2a0dc393a4
* keymap.c (access_keymap): Add AUTOLOAD parameter.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
32145
diff
changeset
|
532 |
45279
220c13a65624
(keymap_parent): New fun, extracted from Fkeymap_parent.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
45235
diff
changeset
|
533 /* t_binding is where we put a default binding that applies, |
220c13a65624
(keymap_parent): New fun, extracted from Fkeymap_parent.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
45235
diff
changeset
|
534 to use in case we do not find a binding specifically |
220c13a65624
(keymap_parent): New fun, extracted from Fkeymap_parent.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
45235
diff
changeset
|
535 for this key sequence. */ |
250 | 536 { |
1209
1aa2cd425737
* keymap.c (DENSE_TABLE_SIZE): Doc fix.
Jim Blandy <jimb@redhat.com>
parents:
1160
diff
changeset
|
537 Lisp_Object tail; |
45279
220c13a65624
(keymap_parent): New fun, extracted from Fkeymap_parent.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
45235
diff
changeset
|
538 Lisp_Object t_binding = Qnil; |
220c13a65624
(keymap_parent): New fun, extracted from Fkeymap_parent.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
45235
diff
changeset
|
539 struct gcpro gcpro1, gcpro2, gcpro3, gcpro4; |
220c13a65624
(keymap_parent): New fun, extracted from Fkeymap_parent.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
45235
diff
changeset
|
540 |
220c13a65624
(keymap_parent): New fun, extracted from Fkeymap_parent.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
45235
diff
changeset
|
541 GCPRO4 (map, tail, idx, t_binding); |
39940
a6ced7cb88d9
(access_keymap): Unify handling of `t' and generic-char.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
39837
diff
changeset
|
542 |
32476
9b2a0dc393a4
* keymap.c (access_keymap): Add AUTOLOAD parameter.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
32145
diff
changeset
|
543 for (tail = XCDR (map); |
32615
5f6178a60e6b
(access_keymap): If IDX has a meta prefix, and there's
Gerd Moellmann <gerd@gnu.org>
parents:
32559
diff
changeset
|
544 (CONSP (tail) |
32988
c3435dc00ed7
* lisp.h (KEYMAPP): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
32889
diff
changeset
|
545 || (tail = get_keymap (tail, 0, autoload), CONSP (tail))); |
32476
9b2a0dc393a4
* keymap.c (access_keymap): Add AUTOLOAD parameter.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
32145
diff
changeset
|
546 tail = XCDR (tail)) |
1209
1aa2cd425737
* keymap.c (DENSE_TABLE_SIZE): Doc fix.
Jim Blandy <jimb@redhat.com>
parents:
1160
diff
changeset
|
547 { |
6502
18dfda644bc0
(access_keymap, store_in_keymap, Fcopy_keymap, Fdefine_key,
Karl Heuer <kwzh@gnu.org>
parents:
6475
diff
changeset
|
548 Lisp_Object binding; |
250 | 549 |
25662
0a7261c1d487
Use XCAR, XCDR, and XFLOAT_DATA instead of explicit member access.
Ken Raeburn <raeburn@raeburn.org>
parents:
25600
diff
changeset
|
550 binding = XCAR (tail); |
9973
1d5a908f201e
(access_keymap): Use type test macros.
Karl Heuer <kwzh@gnu.org>
parents:
9957
diff
changeset
|
551 if (SYMBOLP (binding)) |
1209
1aa2cd425737
* keymap.c (DENSE_TABLE_SIZE): Doc fix.
Jim Blandy <jimb@redhat.com>
parents:
1160
diff
changeset
|
552 { |
3735
7193a99a87c1
Make prefix keys work with keymap inheritance
Richard M. Stallman <rms@gnu.org>
parents:
3691
diff
changeset
|
553 /* If NOINHERIT, stop finding prefix definitions |
7193a99a87c1
Make prefix keys work with keymap inheritance
Richard M. Stallman <rms@gnu.org>
parents:
3691
diff
changeset
|
554 after we pass a second occurrence of the `keymap' symbol. */ |
32476
9b2a0dc393a4
* keymap.c (access_keymap): Add AUTOLOAD parameter.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
32145
diff
changeset
|
555 if (noinherit && EQ (binding, Qkeymap)) |
45279
220c13a65624
(keymap_parent): New fun, extracted from Fkeymap_parent.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
45235
diff
changeset
|
556 RETURN_UNGCPRO (Qnil); |
9973
1d5a908f201e
(access_keymap): Use type test macros.
Karl Heuer <kwzh@gnu.org>
parents:
9957
diff
changeset
|
557 } |
1d5a908f201e
(access_keymap): Use type test macros.
Karl Heuer <kwzh@gnu.org>
parents:
9957
diff
changeset
|
558 else if (CONSP (binding)) |
1d5a908f201e
(access_keymap): Use type test macros.
Karl Heuer <kwzh@gnu.org>
parents:
9957
diff
changeset
|
559 { |
38888
bf8f70dc79f4
(access_keymap): If a binding of the form (GENERIC-CHAR
Gerd Moellmann <gerd@gnu.org>
parents:
37938
diff
changeset
|
560 Lisp_Object key = XCAR (binding); |
45619
dbd65bd8bb4f
(describe_command): Cast `current_column' return value to int.
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
45404
diff
changeset
|
561 |
38888
bf8f70dc79f4
(access_keymap): If a binding of the form (GENERIC-CHAR
Gerd Moellmann <gerd@gnu.org>
parents:
37938
diff
changeset
|
562 if (EQ (key, idx)) |
39940
a6ced7cb88d9
(access_keymap): Unify handling of `t' and generic-char.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
39837
diff
changeset
|
563 val = XCDR (binding); |
93882
9eaa3ee184e9
(access_keymap): Remove the value 2 for t_ok which was used
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
93664
diff
changeset
|
564 else if (t_ok && EQ (key, Qt)) |
39940
a6ced7cb88d9
(access_keymap): Unify handling of `t' and generic-char.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
39837
diff
changeset
|
565 { |
a6ced7cb88d9
(access_keymap): Unify handling of `t' and generic-char.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
39837
diff
changeset
|
566 t_binding = XCDR (binding); |
93882
9eaa3ee184e9
(access_keymap): Remove the value 2 for t_ok which was used
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
93664
diff
changeset
|
567 t_ok = 0; |
39940
a6ced7cb88d9
(access_keymap): Unify handling of `t' and generic-char.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
39837
diff
changeset
|
568 } |
9973
1d5a908f201e
(access_keymap): Use type test macros.
Karl Heuer <kwzh@gnu.org>
parents:
9957
diff
changeset
|
569 } |
1d5a908f201e
(access_keymap): Use type test macros.
Karl Heuer <kwzh@gnu.org>
parents:
9957
diff
changeset
|
570 else if (VECTORP (binding)) |
1d5a908f201e
(access_keymap): Use type test macros.
Karl Heuer <kwzh@gnu.org>
parents:
9957
diff
changeset
|
571 { |
39940
a6ced7cb88d9
(access_keymap): Unify handling of `t' and generic-char.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
39837
diff
changeset
|
572 if (NATNUMP (idx) && XFASTINT (idx) < ASIZE (binding)) |
a6ced7cb88d9
(access_keymap): Unify handling of `t' and generic-char.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
39837
diff
changeset
|
573 val = AREF (binding, XFASTINT (idx)); |
1209
1aa2cd425737
* keymap.c (DENSE_TABLE_SIZE): Doc fix.
Jim Blandy <jimb@redhat.com>
parents:
1160
diff
changeset
|
574 } |
17788
208d71ea3a4f
(get_keyelt): Handle an indirect entry with meta char.
Richard M. Stallman <rms@gnu.org>
parents:
17511
diff
changeset
|
575 else if (CHAR_TABLE_P (binding)) |
208d71ea3a4f
(get_keyelt): Handle an indirect entry with meta char.
Richard M. Stallman <rms@gnu.org>
parents:
17511
diff
changeset
|
576 { |
17932
78a128b99e05
(access_keymap, store_in_keymap): Don't look in a char-table
Richard M. Stallman <rms@gnu.org>
parents:
17861
diff
changeset
|
577 /* Character codes with modifiers |
78a128b99e05
(access_keymap, store_in_keymap): Don't look in a char-table
Richard M. Stallman <rms@gnu.org>
parents:
17861
diff
changeset
|
578 are not included in a char-table. |
78a128b99e05
(access_keymap, store_in_keymap): Don't look in a char-table
Richard M. Stallman <rms@gnu.org>
parents:
17861
diff
changeset
|
579 All character codes without modifiers are included. */ |
41593
bc65be224d92
(access_keymap): Handle t bindings like nil bindings.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
41387
diff
changeset
|
580 if (NATNUMP (idx) && (XFASTINT (idx) & CHAR_MODIFIER_MASK) == 0) |
bc65be224d92
(access_keymap): Handle t bindings like nil bindings.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
41387
diff
changeset
|
581 { |
bc65be224d92
(access_keymap): Handle t bindings like nil bindings.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
41387
diff
changeset
|
582 val = Faref (binding, idx); |
bc65be224d92
(access_keymap): Handle t bindings like nil bindings.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
41387
diff
changeset
|
583 /* `nil' has a special meaning for char-tables, so |
bc65be224d92
(access_keymap): Handle t bindings like nil bindings.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
41387
diff
changeset
|
584 we use something else to record an explicitly |
bc65be224d92
(access_keymap): Handle t bindings like nil bindings.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
41387
diff
changeset
|
585 unbound entry. */ |
bc65be224d92
(access_keymap): Handle t bindings like nil bindings.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
41387
diff
changeset
|
586 if (NILP (val)) |
bc65be224d92
(access_keymap): Handle t bindings like nil bindings.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
41387
diff
changeset
|
587 val = Qunbound; |
bc65be224d92
(access_keymap): Handle t bindings like nil bindings.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
41387
diff
changeset
|
588 } |
17788
208d71ea3a4f
(get_keyelt): Handle an indirect entry with meta char.
Richard M. Stallman <rms@gnu.org>
parents:
17511
diff
changeset
|
589 } |
1264
6ba9d5aaace6
* keymap.c (access_keymap): Don't forget to QUIT while scanning
Jim Blandy <jimb@redhat.com>
parents:
1236
diff
changeset
|
590 |
39940
a6ced7cb88d9
(access_keymap): Unify handling of `t' and generic-char.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
39837
diff
changeset
|
591 /* If we found a binding, clean it up and return it. */ |
a6ced7cb88d9
(access_keymap): Unify handling of `t' and generic-char.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
39837
diff
changeset
|
592 if (!EQ (val, Qunbound)) |
a6ced7cb88d9
(access_keymap): Unify handling of `t' and generic-char.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
39837
diff
changeset
|
593 { |
41593
bc65be224d92
(access_keymap): Handle t bindings like nil bindings.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
41387
diff
changeset
|
594 if (EQ (val, Qt)) |
bc65be224d92
(access_keymap): Handle t bindings like nil bindings.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
41387
diff
changeset
|
595 /* A Qt binding is just like an explicit nil binding |
bc65be224d92
(access_keymap): Handle t bindings like nil bindings.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
41387
diff
changeset
|
596 (i.e. it shadows any parent binding but not bindings in |
bc65be224d92
(access_keymap): Handle t bindings like nil bindings.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
41387
diff
changeset
|
597 keymaps of lower precedence). */ |
bc65be224d92
(access_keymap): Handle t bindings like nil bindings.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
41387
diff
changeset
|
598 val = Qnil; |
39940
a6ced7cb88d9
(access_keymap): Unify handling of `t' and generic-char.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
39837
diff
changeset
|
599 val = get_keyelt (val, autoload); |
a6ced7cb88d9
(access_keymap): Unify handling of `t' and generic-char.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
39837
diff
changeset
|
600 if (KEYMAPP (val)) |
a6ced7cb88d9
(access_keymap): Unify handling of `t' and generic-char.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
39837
diff
changeset
|
601 fix_submap_inheritance (map, idx, val); |
45279
220c13a65624
(keymap_parent): New fun, extracted from Fkeymap_parent.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
45235
diff
changeset
|
602 RETURN_UNGCPRO (val); |
39940
a6ced7cb88d9
(access_keymap): Unify handling of `t' and generic-char.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
39837
diff
changeset
|
603 } |
1264
6ba9d5aaace6
* keymap.c (access_keymap): Don't forget to QUIT while scanning
Jim Blandy <jimb@redhat.com>
parents:
1236
diff
changeset
|
604 QUIT; |
250 | 605 } |
45279
220c13a65624
(keymap_parent): New fun, extracted from Fkeymap_parent.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
45235
diff
changeset
|
606 UNGCPRO; |
32476
9b2a0dc393a4
* keymap.c (access_keymap): Add AUTOLOAD parameter.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
32145
diff
changeset
|
607 return get_keyelt (t_binding, autoload); |
1236
5e8c234e5f03
* keymap.c (access_keymap): Remove code to notice bindings for
Jim Blandy <jimb@redhat.com>
parents:
1209
diff
changeset
|
608 } |
250 | 609 } |
610 | |
50798
2d72cdb7e9f8
(map_keymap_item, map_keymap_char_table_item, map_keymap)
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
50190
diff
changeset
|
611 static void |
109126
aec1143e8d85
Convert (most) functions in src to standard C.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
109100
diff
changeset
|
612 map_keymap_item (map_keymap_function_t fun, Lisp_Object args, Lisp_Object key, Lisp_Object val, void *data) |
50798
2d72cdb7e9f8
(map_keymap_item, map_keymap_char_table_item, map_keymap)
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
50190
diff
changeset
|
613 { |
2d72cdb7e9f8
(map_keymap_item, map_keymap_char_table_item, map_keymap)
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
50190
diff
changeset
|
614 /* We should maybe try to detect bindings shadowed by previous |
2d72cdb7e9f8
(map_keymap_item, map_keymap_char_table_item, map_keymap)
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
50190
diff
changeset
|
615 ones and things like that. */ |
2d72cdb7e9f8
(map_keymap_item, map_keymap_char_table_item, map_keymap)
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
50190
diff
changeset
|
616 if (EQ (val, Qt)) |
2d72cdb7e9f8
(map_keymap_item, map_keymap_char_table_item, map_keymap)
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
50190
diff
changeset
|
617 val = Qnil; |
2d72cdb7e9f8
(map_keymap_item, map_keymap_char_table_item, map_keymap)
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
50190
diff
changeset
|
618 (*fun) (key, val, args, data); |
2d72cdb7e9f8
(map_keymap_item, map_keymap_char_table_item, map_keymap)
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
50190
diff
changeset
|
619 } |
2d72cdb7e9f8
(map_keymap_item, map_keymap_char_table_item, map_keymap)
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
50190
diff
changeset
|
620 |
2d72cdb7e9f8
(map_keymap_item, map_keymap_char_table_item, map_keymap)
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
50190
diff
changeset
|
621 static void |
109126
aec1143e8d85
Convert (most) functions in src to standard C.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
109100
diff
changeset
|
622 map_keymap_char_table_item (Lisp_Object args, Lisp_Object key, Lisp_Object val) |
50798
2d72cdb7e9f8
(map_keymap_item, map_keymap_char_table_item, map_keymap)
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
50190
diff
changeset
|
623 { |
2d72cdb7e9f8
(map_keymap_item, map_keymap_char_table_item, map_keymap)
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
50190
diff
changeset
|
624 if (!NILP (val)) |
2d72cdb7e9f8
(map_keymap_item, map_keymap_char_table_item, map_keymap)
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
50190
diff
changeset
|
625 { |
2d72cdb7e9f8
(map_keymap_item, map_keymap_char_table_item, map_keymap)
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
50190
diff
changeset
|
626 map_keymap_function_t fun = XSAVE_VALUE (XCAR (args))->pointer; |
2d72cdb7e9f8
(map_keymap_item, map_keymap_char_table_item, map_keymap)
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
50190
diff
changeset
|
627 args = XCDR (args); |
100689
eca026eee0d7
(map_keymap_char_table_item): Make a copy of KEY if it is a
Andreas Schwab <schwab@suse.de>
parents:
99981
diff
changeset
|
628 /* If the key is a range, make a copy since map_char_table modifies |
eca026eee0d7
(map_keymap_char_table_item): Make a copy of KEY if it is a
Andreas Schwab <schwab@suse.de>
parents:
99981
diff
changeset
|
629 it in place. */ |
eca026eee0d7
(map_keymap_char_table_item): Make a copy of KEY if it is a
Andreas Schwab <schwab@suse.de>
parents:
99981
diff
changeset
|
630 if (CONSP (key)) |
eca026eee0d7
(map_keymap_char_table_item): Make a copy of KEY if it is a
Andreas Schwab <schwab@suse.de>
parents:
99981
diff
changeset
|
631 key = Fcons (XCAR (key), XCDR (key)); |
50798
2d72cdb7e9f8
(map_keymap_item, map_keymap_char_table_item, map_keymap)
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
50190
diff
changeset
|
632 map_keymap_item (fun, XCDR (args), key, val, |
2d72cdb7e9f8
(map_keymap_item, map_keymap_char_table_item, map_keymap)
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
50190
diff
changeset
|
633 XSAVE_VALUE (XCAR (args))->pointer); |
2d72cdb7e9f8
(map_keymap_item, map_keymap_char_table_item, map_keymap)
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
50190
diff
changeset
|
634 } |
2d72cdb7e9f8
(map_keymap_item, map_keymap_char_table_item, map_keymap)
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
50190
diff
changeset
|
635 } |
2d72cdb7e9f8
(map_keymap_item, map_keymap_char_table_item, map_keymap)
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
50190
diff
changeset
|
636 |
93205
29c57be95740
(map_keymap_internal): New fun.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
93204
diff
changeset
|
637 /* Call FUN for every binding in MAP and stop at (and return) the parent. |
29c57be95740
(map_keymap_internal): New fun.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
93204
diff
changeset
|
638 FUN is called with 4 arguments: FUN (KEY, BINDING, ARGS, DATA). */ |
29c57be95740
(map_keymap_internal): New fun.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
93204
diff
changeset
|
639 Lisp_Object |
29c57be95740
(map_keymap_internal): New fun.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
93204
diff
changeset
|
640 map_keymap_internal (Lisp_Object map, |
29c57be95740
(map_keymap_internal): New fun.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
93204
diff
changeset
|
641 map_keymap_function_t fun, |
29c57be95740
(map_keymap_internal): New fun.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
93204
diff
changeset
|
642 Lisp_Object args, |
29c57be95740
(map_keymap_internal): New fun.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
93204
diff
changeset
|
643 void *data) |
50798
2d72cdb7e9f8
(map_keymap_item, map_keymap_char_table_item, map_keymap)
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
50190
diff
changeset
|
644 { |
2d72cdb7e9f8
(map_keymap_item, map_keymap_char_table_item, map_keymap)
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
50190
diff
changeset
|
645 struct gcpro gcpro1, gcpro2, gcpro3; |
93205
29c57be95740
(map_keymap_internal): New fun.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
93204
diff
changeset
|
646 Lisp_Object tail |
29c57be95740
(map_keymap_internal): New fun.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
93204
diff
changeset
|
647 = (CONSP (map) && EQ (Qkeymap, XCAR (map))) ? XCDR (map) : map; |
29c57be95740
(map_keymap_internal): New fun.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
93204
diff
changeset
|
648 |
50798
2d72cdb7e9f8
(map_keymap_item, map_keymap_char_table_item, map_keymap)
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
50190
diff
changeset
|
649 GCPRO3 (map, args, tail); |
93205
29c57be95740
(map_keymap_internal): New fun.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
93204
diff
changeset
|
650 for (; CONSP (tail) && !EQ (Qkeymap, XCAR (tail)); tail = XCDR (tail)) |
50798
2d72cdb7e9f8
(map_keymap_item, map_keymap_char_table_item, map_keymap)
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
50190
diff
changeset
|
651 { |
2d72cdb7e9f8
(map_keymap_item, map_keymap_char_table_item, map_keymap)
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
50190
diff
changeset
|
652 Lisp_Object binding = XCAR (tail); |
54925
f0a7441d22f6
(Fkey_description): Add optional PREFIX arg.
Kim F. Storm <storm@cua.dk>
parents:
53808
diff
changeset
|
653 |
50798
2d72cdb7e9f8
(map_keymap_item, map_keymap_char_table_item, map_keymap)
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
50190
diff
changeset
|
654 if (CONSP (binding)) |
2d72cdb7e9f8
(map_keymap_item, map_keymap_char_table_item, map_keymap)
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
50190
diff
changeset
|
655 map_keymap_item (fun, args, XCAR (binding), XCDR (binding), data); |
2d72cdb7e9f8
(map_keymap_item, map_keymap_char_table_item, map_keymap)
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
50190
diff
changeset
|
656 else if (VECTORP (binding)) |
2d72cdb7e9f8
(map_keymap_item, map_keymap_char_table_item, map_keymap)
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
50190
diff
changeset
|
657 { |
2d72cdb7e9f8
(map_keymap_item, map_keymap_char_table_item, map_keymap)
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
50190
diff
changeset
|
658 /* Loop over the char values represented in the vector. */ |
2d72cdb7e9f8
(map_keymap_item, map_keymap_char_table_item, map_keymap)
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
50190
diff
changeset
|
659 int len = ASIZE (binding); |
2d72cdb7e9f8
(map_keymap_item, map_keymap_char_table_item, map_keymap)
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
50190
diff
changeset
|
660 int c; |
2d72cdb7e9f8
(map_keymap_item, map_keymap_char_table_item, map_keymap)
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
50190
diff
changeset
|
661 for (c = 0; c < len; c++) |
2d72cdb7e9f8
(map_keymap_item, map_keymap_char_table_item, map_keymap)
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
50190
diff
changeset
|
662 { |
2d72cdb7e9f8
(map_keymap_item, map_keymap_char_table_item, map_keymap)
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
50190
diff
changeset
|
663 Lisp_Object character; |
2d72cdb7e9f8
(map_keymap_item, map_keymap_char_table_item, map_keymap)
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
50190
diff
changeset
|
664 XSETFASTINT (character, c); |
2d72cdb7e9f8
(map_keymap_item, map_keymap_char_table_item, map_keymap)
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
50190
diff
changeset
|
665 map_keymap_item (fun, args, character, AREF (binding, c), data); |
2d72cdb7e9f8
(map_keymap_item, map_keymap_char_table_item, map_keymap)
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
50190
diff
changeset
|
666 } |
2d72cdb7e9f8
(map_keymap_item, map_keymap_char_table_item, map_keymap)
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
50190
diff
changeset
|
667 } |
2d72cdb7e9f8
(map_keymap_item, map_keymap_char_table_item, map_keymap)
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
50190
diff
changeset
|
668 else if (CHAR_TABLE_P (binding)) |
2d72cdb7e9f8
(map_keymap_item, map_keymap_char_table_item, map_keymap)
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
50190
diff
changeset
|
669 { |
89483 | 670 map_char_table (map_keymap_char_table_item, Qnil, binding, |
50798
2d72cdb7e9f8
(map_keymap_item, map_keymap_char_table_item, map_keymap)
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
50190
diff
changeset
|
671 Fcons (make_save_value (fun, 0), |
2d72cdb7e9f8
(map_keymap_item, map_keymap_char_table_item, map_keymap)
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
50190
diff
changeset
|
672 Fcons (make_save_value (data, 0), |
89483 | 673 args))); |
50798
2d72cdb7e9f8
(map_keymap_item, map_keymap_char_table_item, map_keymap)
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
50190
diff
changeset
|
674 } |
2d72cdb7e9f8
(map_keymap_item, map_keymap_char_table_item, map_keymap)
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
50190
diff
changeset
|
675 } |
2d72cdb7e9f8
(map_keymap_item, map_keymap_char_table_item, map_keymap)
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
50190
diff
changeset
|
676 UNGCPRO; |
93205
29c57be95740
(map_keymap_internal): New fun.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
93204
diff
changeset
|
677 return tail; |
50798
2d72cdb7e9f8
(map_keymap_item, map_keymap_char_table_item, map_keymap)
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
50190
diff
changeset
|
678 } |
2d72cdb7e9f8
(map_keymap_item, map_keymap_char_table_item, map_keymap)
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
50190
diff
changeset
|
679 |
2d72cdb7e9f8
(map_keymap_item, map_keymap_char_table_item, map_keymap)
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
50190
diff
changeset
|
680 static void |
109126
aec1143e8d85
Convert (most) functions in src to standard C.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
109100
diff
changeset
|
681 map_keymap_call (Lisp_Object key, Lisp_Object val, Lisp_Object fun, void *dummy) |
50798
2d72cdb7e9f8
(map_keymap_item, map_keymap_char_table_item, map_keymap)
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
50190
diff
changeset
|
682 { |
2d72cdb7e9f8
(map_keymap_item, map_keymap_char_table_item, map_keymap)
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
50190
diff
changeset
|
683 call2 (fun, key, val); |
2d72cdb7e9f8
(map_keymap_item, map_keymap_char_table_item, map_keymap)
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
50190
diff
changeset
|
684 } |
2d72cdb7e9f8
(map_keymap_item, map_keymap_char_table_item, map_keymap)
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
50190
diff
changeset
|
685 |
93205
29c57be95740
(map_keymap_internal): New fun.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
93204
diff
changeset
|
686 /* Same as map_keymap_internal, but doesn't traverses parent keymaps as well. |
29c57be95740
(map_keymap_internal): New fun.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
93204
diff
changeset
|
687 A non-zero AUTOLOAD indicates that autoloaded keymaps should be loaded. */ |
29c57be95740
(map_keymap_internal): New fun.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
93204
diff
changeset
|
688 void |
109126
aec1143e8d85
Convert (most) functions in src to standard C.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
109100
diff
changeset
|
689 map_keymap (Lisp_Object map, map_keymap_function_t fun, Lisp_Object args, void *data, int autoload) |
93205
29c57be95740
(map_keymap_internal): New fun.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
93204
diff
changeset
|
690 { |
29c57be95740
(map_keymap_internal): New fun.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
93204
diff
changeset
|
691 struct gcpro gcpro1; |
29c57be95740
(map_keymap_internal): New fun.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
93204
diff
changeset
|
692 GCPRO1 (args); |
29c57be95740
(map_keymap_internal): New fun.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
93204
diff
changeset
|
693 map = get_keymap (map, 1, autoload); |
29c57be95740
(map_keymap_internal): New fun.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
93204
diff
changeset
|
694 while (CONSP (map)) |
29c57be95740
(map_keymap_internal): New fun.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
93204
diff
changeset
|
695 { |
29c57be95740
(map_keymap_internal): New fun.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
93204
diff
changeset
|
696 map = map_keymap_internal (map, fun, args, data); |
29c57be95740
(map_keymap_internal): New fun.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
93204
diff
changeset
|
697 map = get_keymap (map, 0, autoload); |
29c57be95740
(map_keymap_internal): New fun.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
93204
diff
changeset
|
698 } |
29c57be95740
(map_keymap_internal): New fun.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
93204
diff
changeset
|
699 UNGCPRO; |
29c57be95740
(map_keymap_internal): New fun.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
93204
diff
changeset
|
700 } |
29c57be95740
(map_keymap_internal): New fun.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
93204
diff
changeset
|
701 |
93664
c7dd307b0ec5
* subr.el (keymap-canonicalize): New function.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
93205
diff
changeset
|
702 Lisp_Object Qkeymap_canonicalize; |
c7dd307b0ec5
* subr.el (keymap-canonicalize): New function.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
93205
diff
changeset
|
703 |
c7dd307b0ec5
* subr.el (keymap-canonicalize): New function.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
93205
diff
changeset
|
704 /* Same as map_keymap, but does it right, properly eliminating duplicate |
c7dd307b0ec5
* subr.el (keymap-canonicalize): New function.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
93205
diff
changeset
|
705 bindings due to inheritance. */ |
c7dd307b0ec5
* subr.el (keymap-canonicalize): New function.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
93205
diff
changeset
|
706 void |
109126
aec1143e8d85
Convert (most) functions in src to standard C.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
109100
diff
changeset
|
707 map_keymap_canonical (Lisp_Object map, map_keymap_function_t fun, Lisp_Object args, void *data) |
93664
c7dd307b0ec5
* subr.el (keymap-canonicalize): New function.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
93205
diff
changeset
|
708 { |
c7dd307b0ec5
* subr.el (keymap-canonicalize): New function.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
93205
diff
changeset
|
709 struct gcpro gcpro1; |
c7dd307b0ec5
* subr.el (keymap-canonicalize): New function.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
93205
diff
changeset
|
710 GCPRO1 (args); |
c7dd307b0ec5
* subr.el (keymap-canonicalize): New function.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
93205
diff
changeset
|
711 /* map_keymap_canonical may be used from redisplay (e.g. when building menus) |
c7dd307b0ec5
* subr.el (keymap-canonicalize): New function.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
93205
diff
changeset
|
712 so be careful to ignore errors and to inhibit redisplay. */ |
c7dd307b0ec5
* subr.el (keymap-canonicalize): New function.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
93205
diff
changeset
|
713 map = safe_call1 (Qkeymap_canonicalize, map); |
c7dd307b0ec5
* subr.el (keymap-canonicalize): New function.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
93205
diff
changeset
|
714 /* No need to use `map_keymap' here because canonical map has no parent. */ |
c7dd307b0ec5
* subr.el (keymap-canonicalize): New function.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
93205
diff
changeset
|
715 map_keymap_internal (map, fun, args, data); |
c7dd307b0ec5
* subr.el (keymap-canonicalize): New function.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
93205
diff
changeset
|
716 UNGCPRO; |
c7dd307b0ec5
* subr.el (keymap-canonicalize): New function.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
93205
diff
changeset
|
717 } |
c7dd307b0ec5
* subr.el (keymap-canonicalize): New function.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
93205
diff
changeset
|
718 |
93205
29c57be95740
(map_keymap_internal): New fun.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
93204
diff
changeset
|
719 DEFUN ("map-keymap-internal", Fmap_keymap_internal, Smap_keymap_internal, 2, 2, 0, |
29c57be95740
(map_keymap_internal): New fun.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
93204
diff
changeset
|
720 doc: /* Call FUNCTION once for each event binding in KEYMAP. |
29c57be95740
(map_keymap_internal): New fun.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
93204
diff
changeset
|
721 FUNCTION is called with two arguments: the event that is bound, and |
29c57be95740
(map_keymap_internal): New fun.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
93204
diff
changeset
|
722 the definition it is bound to. The event may be a character range. |
29c57be95740
(map_keymap_internal): New fun.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
93204
diff
changeset
|
723 If KEYMAP has a parent, this function returns it without processing it. */) |
109179
8cfee7d2955f
Convert DEFUNs to standard C.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
109165
diff
changeset
|
724 (Lisp_Object function, Lisp_Object keymap) |
93205
29c57be95740
(map_keymap_internal): New fun.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
93204
diff
changeset
|
725 { |
29c57be95740
(map_keymap_internal): New fun.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
93204
diff
changeset
|
726 struct gcpro gcpro1; |
29c57be95740
(map_keymap_internal): New fun.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
93204
diff
changeset
|
727 GCPRO1 (function); |
29c57be95740
(map_keymap_internal): New fun.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
93204
diff
changeset
|
728 keymap = get_keymap (keymap, 1, 1); |
29c57be95740
(map_keymap_internal): New fun.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
93204
diff
changeset
|
729 keymap = map_keymap_internal (keymap, map_keymap_call, function, NULL); |
29c57be95740
(map_keymap_internal): New fun.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
93204
diff
changeset
|
730 UNGCPRO; |
29c57be95740
(map_keymap_internal): New fun.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
93204
diff
changeset
|
731 return keymap; |
29c57be95740
(map_keymap_internal): New fun.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
93204
diff
changeset
|
732 } |
29c57be95740
(map_keymap_internal): New fun.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
93204
diff
changeset
|
733 |
58271
8b3b0ccbe80b
(Fmap_keymap): New arg SORT-FIRST. Use
Richard M. Stallman <rms@gnu.org>
parents:
58129
diff
changeset
|
734 DEFUN ("map-keymap", Fmap_keymap, Smap_keymap, 2, 3, 0, |
68397
5b1791b98dc2
(Fmap_keymap): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
68264
diff
changeset
|
735 doc: /* Call FUNCTION once for each event binding in KEYMAP. |
68264
d25897b05660
(Fmap_keymap): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
67994
diff
changeset
|
736 FUNCTION is called with two arguments: the event that is bound, and |
93205
29c57be95740
(map_keymap_internal): New fun.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
93204
diff
changeset
|
737 the definition it is bound to. The event may be a character range. |
68264
d25897b05660
(Fmap_keymap): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
67994
diff
changeset
|
738 |
56635
a8be0bc345d2
(Fmake_keymap, Fmap_keymap, Fwhere_is_internal): Doc fixes.
Luc Teirlinck <teirllm@auburn.edu>
parents:
56618
diff
changeset
|
739 If KEYMAP has a parent, the parent's bindings are included as well. |
a8be0bc345d2
(Fmake_keymap, Fmap_keymap, Fwhere_is_internal): Doc fixes.
Luc Teirlinck <teirllm@auburn.edu>
parents:
56618
diff
changeset
|
740 This works recursively: if the parent has itself a parent, then the |
58271
8b3b0ccbe80b
(Fmap_keymap): New arg SORT-FIRST. Use
Richard M. Stallman <rms@gnu.org>
parents:
58129
diff
changeset
|
741 grandparent's bindings are also included and so on. |
8b3b0ccbe80b
(Fmap_keymap): New arg SORT-FIRST. Use
Richard M. Stallman <rms@gnu.org>
parents:
58129
diff
changeset
|
742 usage: (map-keymap FUNCTION KEYMAP) */) |
109179
8cfee7d2955f
Convert DEFUNs to standard C.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
109165
diff
changeset
|
743 (Lisp_Object function, Lisp_Object keymap, Lisp_Object sort_first) |
50798
2d72cdb7e9f8
(map_keymap_item, map_keymap_char_table_item, map_keymap)
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
50190
diff
changeset
|
744 { |
58271
8b3b0ccbe80b
(Fmap_keymap): New arg SORT-FIRST. Use
Richard M. Stallman <rms@gnu.org>
parents:
58129
diff
changeset
|
745 if (! NILP (sort_first)) |
93204
9f83f0ec5257
* subr.el (map-keymap-sorted): Rename from map-keymap-internal.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
91670
diff
changeset
|
746 return call2 (intern ("map-keymap-sorted"), function, keymap); |
65456
d9638b932900
(Fdescribe_buffer_bindings): Reload `translate'
Kim F. Storm <storm@cua.dk>
parents:
64770
diff
changeset
|
747 |
50798
2d72cdb7e9f8
(map_keymap_item, map_keymap_char_table_item, map_keymap)
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
50190
diff
changeset
|
748 map_keymap (keymap, map_keymap_call, function, NULL, 1); |
2d72cdb7e9f8
(map_keymap_item, map_keymap_char_table_item, map_keymap)
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
50190
diff
changeset
|
749 return Qnil; |
2d72cdb7e9f8
(map_keymap_item, map_keymap_char_table_item, map_keymap)
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
50190
diff
changeset
|
750 } |
2d72cdb7e9f8
(map_keymap_item, map_keymap_char_table_item, map_keymap)
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
50190
diff
changeset
|
751 |
250 | 752 /* Given OBJECT which was found in a slot in a keymap, |
753 trace indirect definitions to get the actual definition of that slot. | |
754 An indirect definition is a list of the form | |
755 (KEYMAP . INDEX), where KEYMAP is a keymap or a symbol defined as one | |
756 and INDEX is the object to look up in KEYMAP to yield the definition. | |
757 | |
758 Also if OBJECT has a menu string as the first element, | |
6774
a29237d1fdca
(get_keymap): Pass 1 as ERROR to get_keymap_1.
Richard M. Stallman <rms@gnu.org>
parents:
6695
diff
changeset
|
759 remove that. Also remove a menu help string as second element. |
a29237d1fdca
(get_keymap): Pass 1 as ERROR to get_keymap_1.
Richard M. Stallman <rms@gnu.org>
parents:
6695
diff
changeset
|
760 |
a29237d1fdca
(get_keymap): Pass 1 as ERROR to get_keymap_1.
Richard M. Stallman <rms@gnu.org>
parents:
6695
diff
changeset
|
761 If AUTOLOAD is nonzero, load autoloadable keymaps |
61421
d474c1024296
(where_is_internal): Convert a string used as event type into "(any string)".
Richard M. Stallman <rms@gnu.org>
parents:
60066
diff
changeset
|
762 that are referred to with indirection. |
d474c1024296
(where_is_internal): Convert a string used as event type into "(any string)".
Richard M. Stallman <rms@gnu.org>
parents:
60066
diff
changeset
|
763 |
d474c1024296
(where_is_internal): Convert a string used as event type into "(any string)".
Richard M. Stallman <rms@gnu.org>
parents:
60066
diff
changeset
|
764 This can GC because menu_item_eval_property calls Feval. */ |
250 | 765 |
766 Lisp_Object | |
109126
aec1143e8d85
Convert (most) functions in src to standard C.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
109100
diff
changeset
|
767 get_keyelt (Lisp_Object object, int autoload) |
250 | 768 { |
769 while (1) | |
770 { | |
25128
2563b35e613f
(get_keymap_1, get_keyelt): Check the type of OBJECT
Karl Heuer <kwzh@gnu.org>
parents:
24572
diff
changeset
|
771 if (!(CONSP (object))) |
21241
31bd04a792c2
(fix_submap_inheritance, get_keyelt, store_in_keymap,
Richard M. Stallman <rms@gnu.org>
parents:
20883
diff
changeset
|
772 /* This is really the value. */ |
31bd04a792c2
(fix_submap_inheritance, get_keyelt, store_in_keymap,
Richard M. Stallman <rms@gnu.org>
parents:
20883
diff
changeset
|
773 return object; |
31bd04a792c2
(fix_submap_inheritance, get_keyelt, store_in_keymap,
Richard M. Stallman <rms@gnu.org>
parents:
20883
diff
changeset
|
774 |
25128
2563b35e613f
(get_keymap_1, get_keyelt): Check the type of OBJECT
Karl Heuer <kwzh@gnu.org>
parents:
24572
diff
changeset
|
775 /* If the keymap contents looks like (keymap ...) or (lambda ...) |
2563b35e613f
(get_keymap_1, get_keyelt): Check the type of OBJECT
Karl Heuer <kwzh@gnu.org>
parents:
24572
diff
changeset
|
776 then use itself. */ |
2563b35e613f
(get_keymap_1, get_keyelt): Check the type of OBJECT
Karl Heuer <kwzh@gnu.org>
parents:
24572
diff
changeset
|
777 else if (EQ (XCAR (object), Qkeymap) || EQ (XCAR (object), Qlambda)) |
2563b35e613f
(get_keymap_1, get_keyelt): Check the type of OBJECT
Karl Heuer <kwzh@gnu.org>
parents:
24572
diff
changeset
|
778 return object; |
250 | 779 |
21241
31bd04a792c2
(fix_submap_inheritance, get_keyelt, store_in_keymap,
Richard M. Stallman <rms@gnu.org>
parents:
20883
diff
changeset
|
780 /* If the keymap contents looks like (menu-item name . DEFN) |
31bd04a792c2
(fix_submap_inheritance, get_keyelt, store_in_keymap,
Richard M. Stallman <rms@gnu.org>
parents:
20883
diff
changeset
|
781 or (menu-item name DEFN ...) then use DEFN. |
29941
0c77254c90b8
(get_keyelt): For menu-items containing a `:filter
Gerd Moellmann <gerd@gnu.org>
parents:
29726
diff
changeset
|
782 This is a new format menu item. */ |
25128
2563b35e613f
(get_keymap_1, get_keyelt): Check the type of OBJECT
Karl Heuer <kwzh@gnu.org>
parents:
24572
diff
changeset
|
783 else if (EQ (XCAR (object), Qmenu_item)) |
2563b35e613f
(get_keymap_1, get_keyelt): Check the type of OBJECT
Karl Heuer <kwzh@gnu.org>
parents:
24572
diff
changeset
|
784 { |
2563b35e613f
(get_keymap_1, get_keyelt): Check the type of OBJECT
Karl Heuer <kwzh@gnu.org>
parents:
24572
diff
changeset
|
785 if (CONSP (XCDR (object))) |
2563b35e613f
(get_keymap_1, get_keyelt): Check the type of OBJECT
Karl Heuer <kwzh@gnu.org>
parents:
24572
diff
changeset
|
786 { |
29941
0c77254c90b8
(get_keyelt): For menu-items containing a `:filter
Gerd Moellmann <gerd@gnu.org>
parents:
29726
diff
changeset
|
787 Lisp_Object tem; |
0c77254c90b8
(get_keyelt): For menu-items containing a `:filter
Gerd Moellmann <gerd@gnu.org>
parents:
29726
diff
changeset
|
788 |
25128
2563b35e613f
(get_keymap_1, get_keyelt): Check the type of OBJECT
Karl Heuer <kwzh@gnu.org>
parents:
24572
diff
changeset
|
789 object = XCDR (XCDR (object)); |
29941
0c77254c90b8
(get_keyelt): For menu-items containing a `:filter
Gerd Moellmann <gerd@gnu.org>
parents:
29726
diff
changeset
|
790 tem = object; |
25128
2563b35e613f
(get_keymap_1, get_keyelt): Check the type of OBJECT
Karl Heuer <kwzh@gnu.org>
parents:
24572
diff
changeset
|
791 if (CONSP (object)) |
2563b35e613f
(get_keymap_1, get_keyelt): Check the type of OBJECT
Karl Heuer <kwzh@gnu.org>
parents:
24572
diff
changeset
|
792 object = XCAR (object); |
29941
0c77254c90b8
(get_keyelt): For menu-items containing a `:filter
Gerd Moellmann <gerd@gnu.org>
parents:
29726
diff
changeset
|
793 |
0c77254c90b8
(get_keyelt): For menu-items containing a `:filter
Gerd Moellmann <gerd@gnu.org>
parents:
29726
diff
changeset
|
794 /* If there's a `:filter FILTER', apply FILTER to the |
0c77254c90b8
(get_keyelt): For menu-items containing a `:filter
Gerd Moellmann <gerd@gnu.org>
parents:
29726
diff
changeset
|
795 menu-item's definition to get the real definition to |
34515
35d7808fe9f6
(get_keyelt): Only eval the filter if `autoload' is set.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
34442
diff
changeset
|
796 use. */ |
29941
0c77254c90b8
(get_keyelt): For menu-items containing a `:filter
Gerd Moellmann <gerd@gnu.org>
parents:
29726
diff
changeset
|
797 for (; CONSP (tem) && CONSP (XCDR (tem)); tem = XCDR (tem)) |
34515
35d7808fe9f6
(get_keyelt): Only eval the filter if `autoload' is set.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
34442
diff
changeset
|
798 if (EQ (XCAR (tem), QCfilter) && autoload) |
29941
0c77254c90b8
(get_keyelt): For menu-items containing a `:filter
Gerd Moellmann <gerd@gnu.org>
parents:
29726
diff
changeset
|
799 { |
0c77254c90b8
(get_keyelt): For menu-items containing a `:filter
Gerd Moellmann <gerd@gnu.org>
parents:
29726
diff
changeset
|
800 Lisp_Object filter; |
0c77254c90b8
(get_keyelt): For menu-items containing a `:filter
Gerd Moellmann <gerd@gnu.org>
parents:
29726
diff
changeset
|
801 filter = XCAR (XCDR (tem)); |
0c77254c90b8
(get_keyelt): For menu-items containing a `:filter
Gerd Moellmann <gerd@gnu.org>
parents:
29726
diff
changeset
|
802 filter = list2 (filter, list2 (Qquote, object)); |
0c77254c90b8
(get_keyelt): For menu-items containing a `:filter
Gerd Moellmann <gerd@gnu.org>
parents:
29726
diff
changeset
|
803 object = menu_item_eval_property (filter); |
0c77254c90b8
(get_keyelt): For menu-items containing a `:filter
Gerd Moellmann <gerd@gnu.org>
parents:
29726
diff
changeset
|
804 break; |
0c77254c90b8
(get_keyelt): For menu-items containing a `:filter
Gerd Moellmann <gerd@gnu.org>
parents:
29726
diff
changeset
|
805 } |
25128
2563b35e613f
(get_keymap_1, get_keyelt): Check the type of OBJECT
Karl Heuer <kwzh@gnu.org>
parents:
24572
diff
changeset
|
806 } |
2563b35e613f
(get_keymap_1, get_keyelt): Check the type of OBJECT
Karl Heuer <kwzh@gnu.org>
parents:
24572
diff
changeset
|
807 else |
45279
220c13a65624
(keymap_parent): New fun, extracted from Fkeymap_parent.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
45235
diff
changeset
|
808 /* Invalid keymap. */ |
25128
2563b35e613f
(get_keymap_1, get_keyelt): Check the type of OBJECT
Karl Heuer <kwzh@gnu.org>
parents:
24572
diff
changeset
|
809 return object; |
2563b35e613f
(get_keymap_1, get_keyelt): Check the type of OBJECT
Karl Heuer <kwzh@gnu.org>
parents:
24572
diff
changeset
|
810 } |
2563b35e613f
(get_keymap_1, get_keyelt): Check the type of OBJECT
Karl Heuer <kwzh@gnu.org>
parents:
24572
diff
changeset
|
811 |
2563b35e613f
(get_keymap_1, get_keyelt): Check the type of OBJECT
Karl Heuer <kwzh@gnu.org>
parents:
24572
diff
changeset
|
812 /* If the keymap contents looks like (STRING . DEFN), use DEFN. |
2563b35e613f
(get_keymap_1, get_keyelt): Check the type of OBJECT
Karl Heuer <kwzh@gnu.org>
parents:
24572
diff
changeset
|
813 Keymap alist elements like (CHAR MENUSTRING . DEFN) |
2563b35e613f
(get_keymap_1, get_keyelt): Check the type of OBJECT
Karl Heuer <kwzh@gnu.org>
parents:
24572
diff
changeset
|
814 will be used by HierarKey menus. */ |
2563b35e613f
(get_keymap_1, get_keyelt): Check the type of OBJECT
Karl Heuer <kwzh@gnu.org>
parents:
24572
diff
changeset
|
815 else if (STRINGP (XCAR (object))) |
21241
31bd04a792c2
(fix_submap_inheritance, get_keyelt, store_in_keymap,
Richard M. Stallman <rms@gnu.org>
parents:
20883
diff
changeset
|
816 { |
25128
2563b35e613f
(get_keymap_1, get_keyelt): Check the type of OBJECT
Karl Heuer <kwzh@gnu.org>
parents:
24572
diff
changeset
|
817 object = XCDR (object); |
2563b35e613f
(get_keymap_1, get_keyelt): Check the type of OBJECT
Karl Heuer <kwzh@gnu.org>
parents:
24572
diff
changeset
|
818 /* Also remove a menu help string, if any, |
2563b35e613f
(get_keymap_1, get_keyelt): Check the type of OBJECT
Karl Heuer <kwzh@gnu.org>
parents:
24572
diff
changeset
|
819 following the menu item name. */ |
2563b35e613f
(get_keymap_1, get_keyelt): Check the type of OBJECT
Karl Heuer <kwzh@gnu.org>
parents:
24572
diff
changeset
|
820 if (CONSP (object) && STRINGP (XCAR (object))) |
2563b35e613f
(get_keymap_1, get_keyelt): Check the type of OBJECT
Karl Heuer <kwzh@gnu.org>
parents:
24572
diff
changeset
|
821 object = XCDR (object); |
2563b35e613f
(get_keymap_1, get_keyelt): Check the type of OBJECT
Karl Heuer <kwzh@gnu.org>
parents:
24572
diff
changeset
|
822 /* Also remove the sublist that caches key equivalences, if any. */ |
2563b35e613f
(get_keymap_1, get_keyelt): Check the type of OBJECT
Karl Heuer <kwzh@gnu.org>
parents:
24572
diff
changeset
|
823 if (CONSP (object) && CONSP (XCAR (object))) |
2563b35e613f
(get_keymap_1, get_keyelt): Check the type of OBJECT
Karl Heuer <kwzh@gnu.org>
parents:
24572
diff
changeset
|
824 { |
2563b35e613f
(get_keymap_1, get_keyelt): Check the type of OBJECT
Karl Heuer <kwzh@gnu.org>
parents:
24572
diff
changeset
|
825 Lisp_Object carcar; |
2563b35e613f
(get_keymap_1, get_keyelt): Check the type of OBJECT
Karl Heuer <kwzh@gnu.org>
parents:
24572
diff
changeset
|
826 carcar = XCAR (XCAR (object)); |
2563b35e613f
(get_keymap_1, get_keyelt): Check the type of OBJECT
Karl Heuer <kwzh@gnu.org>
parents:
24572
diff
changeset
|
827 if (NILP (carcar) || VECTORP (carcar)) |
2563b35e613f
(get_keymap_1, get_keyelt): Check the type of OBJECT
Karl Heuer <kwzh@gnu.org>
parents:
24572
diff
changeset
|
828 object = XCDR (object); |
2563b35e613f
(get_keymap_1, get_keyelt): Check the type of OBJECT
Karl Heuer <kwzh@gnu.org>
parents:
24572
diff
changeset
|
829 } |
21241
31bd04a792c2
(fix_submap_inheritance, get_keyelt, store_in_keymap,
Richard M. Stallman <rms@gnu.org>
parents:
20883
diff
changeset
|
830 } |
31bd04a792c2
(fix_submap_inheritance, get_keyelt, store_in_keymap,
Richard M. Stallman <rms@gnu.org>
parents:
20883
diff
changeset
|
831 |
25128
2563b35e613f
(get_keymap_1, get_keyelt): Check the type of OBJECT
Karl Heuer <kwzh@gnu.org>
parents:
24572
diff
changeset
|
832 /* If the contents are (KEYMAP . ELEMENT), go indirect. */ |
250 | 833 else |
25128
2563b35e613f
(get_keymap_1, get_keyelt): Check the type of OBJECT
Karl Heuer <kwzh@gnu.org>
parents:
24572
diff
changeset
|
834 { |
45279
220c13a65624
(keymap_parent): New fun, extracted from Fkeymap_parent.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
45235
diff
changeset
|
835 struct gcpro gcpro1; |
30134
784ef95b020b
(get_keymap_1): Add comment that this function can GC.
Gerd Moellmann <gerd@gnu.org>
parents:
30030
diff
changeset
|
836 Lisp_Object map; |
45279
220c13a65624
(keymap_parent): New fun, extracted from Fkeymap_parent.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
45235
diff
changeset
|
837 GCPRO1 (object); |
32988
c3435dc00ed7
* lisp.h (KEYMAPP): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
32889
diff
changeset
|
838 map = get_keymap (Fcar_safe (object), 0, autoload); |
45279
220c13a65624
(keymap_parent): New fun, extracted from Fkeymap_parent.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
45235
diff
changeset
|
839 UNGCPRO; |
32988
c3435dc00ed7
* lisp.h (KEYMAPP): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
32889
diff
changeset
|
840 return (!CONSP (map) ? object /* Invalid keymap */ |
32476
9b2a0dc393a4
* keymap.c (access_keymap): Add AUTOLOAD parameter.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
32145
diff
changeset
|
841 : access_keymap (map, Fcdr (object), 0, 0, autoload)); |
25128
2563b35e613f
(get_keymap_1, get_keyelt): Check the type of OBJECT
Karl Heuer <kwzh@gnu.org>
parents:
24572
diff
changeset
|
842 } |
250 | 843 } |
844 } | |
845 | |
31232
5213900983ed
(store_in_keymap): Add `static' to declaration.
Dave Love <fx@gnu.org>
parents:
31208
diff
changeset
|
846 static Lisp_Object |
109126
aec1143e8d85
Convert (most) functions in src to standard C.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
109100
diff
changeset
|
847 store_in_keymap (Lisp_Object keymap, register Lisp_Object idx, Lisp_Object def) |
250 | 848 { |
32889
673e3ef1f7f6
(where_is_cache, where_is_cache_keymaps): New vars.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
32846
diff
changeset
|
849 /* Flush any reverse-map cache. */ |
673e3ef1f7f6
(where_is_cache, where_is_cache_keymaps): New vars.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
32846
diff
changeset
|
850 where_is_cache = Qnil; |
673e3ef1f7f6
(where_is_cache, where_is_cache_keymaps): New vars.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
32846
diff
changeset
|
851 where_is_cache_keymaps = Qt; |
673e3ef1f7f6
(where_is_cache, where_is_cache_keymaps): New vars.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
32846
diff
changeset
|
852 |
10367
e1c7a3f0c15f
(store_in_keymap): Copy a cons only if car is a string.
Richard M. Stallman <rms@gnu.org>
parents:
10305
diff
changeset
|
853 /* If we are preparing to dump, and DEF is a menu element |
21241
31bd04a792c2
(fix_submap_inheritance, get_keyelt, store_in_keymap,
Richard M. Stallman <rms@gnu.org>
parents:
20883
diff
changeset
|
854 with a menu item indicator, copy it to ensure it is not pure. */ |
31bd04a792c2
(fix_submap_inheritance, get_keyelt, store_in_keymap,
Richard M. Stallman <rms@gnu.org>
parents:
20883
diff
changeset
|
855 if (CONSP (def) && PURE_P (def) |
25662
0a7261c1d487
Use XCAR, XCDR, and XFLOAT_DATA instead of explicit member access.
Ken Raeburn <raeburn@raeburn.org>
parents:
25600
diff
changeset
|
856 && (EQ (XCAR (def), Qmenu_item) || STRINGP (XCAR (def)))) |
0a7261c1d487
Use XCAR, XCDR, and XFLOAT_DATA instead of explicit member access.
Ken Raeburn <raeburn@raeburn.org>
parents:
25600
diff
changeset
|
857 def = Fcons (XCAR (def), XCDR (def)); |
0a7261c1d487
Use XCAR, XCDR, and XFLOAT_DATA instead of explicit member access.
Ken Raeburn <raeburn@raeburn.org>
parents:
25600
diff
changeset
|
858 |
39689
0572449a62be
(Fkeymap_prompt, Fcurrent_active_maps): New funs.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
39682
diff
changeset
|
859 if (!CONSP (keymap) || !EQ (XCAR (keymap), Qkeymap)) |
1209
1aa2cd425737
* keymap.c (DENSE_TABLE_SIZE): Doc fix.
Jim Blandy <jimb@redhat.com>
parents:
1160
diff
changeset
|
860 error ("attempt to define a key in a non-keymap"); |
1aa2cd425737
* keymap.c (DENSE_TABLE_SIZE): Doc fix.
Jim Blandy <jimb@redhat.com>
parents:
1160
diff
changeset
|
861 |
89640
99303f55a1b8
(store_in_keymap): Pay attention to the case that idx
Kenichi Handa <handa@m17n.org>
parents:
89626
diff
changeset
|
862 /* If idx is a cons, and the car part is a character, idx must be of |
99303f55a1b8
(store_in_keymap): Pay attention to the case that idx
Kenichi Handa <handa@m17n.org>
parents:
89626
diff
changeset
|
863 the form (FROM-CHAR . TO-CHAR). */ |
99303f55a1b8
(store_in_keymap): Pay attention to the case that idx
Kenichi Handa <handa@m17n.org>
parents:
89626
diff
changeset
|
864 if (CONSP (idx) && CHARACTERP (XCAR (idx))) |
99303f55a1b8
(store_in_keymap): Pay attention to the case that idx
Kenichi Handa <handa@m17n.org>
parents:
89626
diff
changeset
|
865 CHECK_CHARACTER_CDR (idx); |
99303f55a1b8
(store_in_keymap): Pay attention to the case that idx
Kenichi Handa <handa@m17n.org>
parents:
89626
diff
changeset
|
866 else |
99303f55a1b8
(store_in_keymap): Pay attention to the case that idx
Kenichi Handa <handa@m17n.org>
parents:
89626
diff
changeset
|
867 /* If idx is a list (some sort of mouse click, perhaps?), |
99303f55a1b8
(store_in_keymap): Pay attention to the case that idx
Kenichi Handa <handa@m17n.org>
parents:
89626
diff
changeset
|
868 the index we want to use is the car of the list, which |
99303f55a1b8
(store_in_keymap): Pay attention to the case that idx
Kenichi Handa <handa@m17n.org>
parents:
89626
diff
changeset
|
869 ought to be a symbol. */ |
99303f55a1b8
(store_in_keymap): Pay attention to the case that idx
Kenichi Handa <handa@m17n.org>
parents:
89626
diff
changeset
|
870 idx = EVENT_HEAD (idx); |
250 | 871 |
1209
1aa2cd425737
* keymap.c (DENSE_TABLE_SIZE): Doc fix.
Jim Blandy <jimb@redhat.com>
parents:
1160
diff
changeset
|
872 /* If idx is a symbol, it might have modifiers, which need to |
1aa2cd425737
* keymap.c (DENSE_TABLE_SIZE): Doc fix.
Jim Blandy <jimb@redhat.com>
parents:
1160
diff
changeset
|
873 be put in the canonical order. */ |
9123
c225137ddefb
(get_keyelt, store_in_keymap, Fcopy_keymap, Fdefine_key, Flookup_key,
Karl Heuer <kwzh@gnu.org>
parents:
8922
diff
changeset
|
874 if (SYMBOLP (idx)) |
1209
1aa2cd425737
* keymap.c (DENSE_TABLE_SIZE): Doc fix.
Jim Blandy <jimb@redhat.com>
parents:
1160
diff
changeset
|
875 idx = reorder_modifiers (idx); |
3515
9d0af0f2dc0d
(access_keymap, store_in_keymap): Discard meaningless
Richard M. Stallman <rms@gnu.org>
parents:
3425
diff
changeset
|
876 else if (INTEGERP (idx)) |
9d0af0f2dc0d
(access_keymap, store_in_keymap): Discard meaningless
Richard M. Stallman <rms@gnu.org>
parents:
3425
diff
changeset
|
877 /* Clobber the high bits that can be present on a machine |
9d0af0f2dc0d
(access_keymap, store_in_keymap): Discard meaningless
Richard M. Stallman <rms@gnu.org>
parents:
3425
diff
changeset
|
878 with more than 24 bits of integer. */ |
9312
dfaf1d41e53d
(synkey, access_keymap, store_in_keymap, Faccessible_keymaps,
Karl Heuer <kwzh@gnu.org>
parents:
9273
diff
changeset
|
879 XSETFASTINT (idx, XINT (idx) & (CHAR_META | (CHAR_META - 1))); |
250 | 880 |
1209
1aa2cd425737
* keymap.c (DENSE_TABLE_SIZE): Doc fix.
Jim Blandy <jimb@redhat.com>
parents:
1160
diff
changeset
|
881 /* Scan the keymap for a binding of idx. */ |
1aa2cd425737
* keymap.c (DENSE_TABLE_SIZE): Doc fix.
Jim Blandy <jimb@redhat.com>
parents:
1160
diff
changeset
|
882 { |
1aa2cd425737
* keymap.c (DENSE_TABLE_SIZE): Doc fix.
Jim Blandy <jimb@redhat.com>
parents:
1160
diff
changeset
|
883 Lisp_Object tail; |
250 | 884 |
1209
1aa2cd425737
* keymap.c (DENSE_TABLE_SIZE): Doc fix.
Jim Blandy <jimb@redhat.com>
parents:
1160
diff
changeset
|
885 /* The cons after which we should insert new bindings. If the |
1aa2cd425737
* keymap.c (DENSE_TABLE_SIZE): Doc fix.
Jim Blandy <jimb@redhat.com>
parents:
1160
diff
changeset
|
886 keymap has a table element, we record its position here, so new |
1aa2cd425737
* keymap.c (DENSE_TABLE_SIZE): Doc fix.
Jim Blandy <jimb@redhat.com>
parents:
1160
diff
changeset
|
887 bindings will go after it; this way, the table will stay |
1aa2cd425737
* keymap.c (DENSE_TABLE_SIZE): Doc fix.
Jim Blandy <jimb@redhat.com>
parents:
1160
diff
changeset
|
888 towards the front of the alist and character lookups in dense |
1aa2cd425737
* keymap.c (DENSE_TABLE_SIZE): Doc fix.
Jim Blandy <jimb@redhat.com>
parents:
1160
diff
changeset
|
889 keymaps will remain fast. Otherwise, this just points at the |
1aa2cd425737
* keymap.c (DENSE_TABLE_SIZE): Doc fix.
Jim Blandy <jimb@redhat.com>
parents:
1160
diff
changeset
|
890 front of the keymap. */ |
6502
18dfda644bc0
(access_keymap, store_in_keymap, Fcopy_keymap, Fdefine_key,
Karl Heuer <kwzh@gnu.org>
parents:
6475
diff
changeset
|
891 Lisp_Object insertion_point; |
1209
1aa2cd425737
* keymap.c (DENSE_TABLE_SIZE): Doc fix.
Jim Blandy <jimb@redhat.com>
parents:
1160
diff
changeset
|
892 |
6502
18dfda644bc0
(access_keymap, store_in_keymap, Fcopy_keymap, Fdefine_key,
Karl Heuer <kwzh@gnu.org>
parents:
6475
diff
changeset
|
893 insertion_point = keymap; |
25662
0a7261c1d487
Use XCAR, XCDR, and XFLOAT_DATA instead of explicit member access.
Ken Raeburn <raeburn@raeburn.org>
parents:
25600
diff
changeset
|
894 for (tail = XCDR (keymap); CONSP (tail); tail = XCDR (tail)) |
250 | 895 { |
6502
18dfda644bc0
(access_keymap, store_in_keymap, Fcopy_keymap, Fdefine_key,
Karl Heuer <kwzh@gnu.org>
parents:
6475
diff
changeset
|
896 Lisp_Object elt; |
1209
1aa2cd425737
* keymap.c (DENSE_TABLE_SIZE): Doc fix.
Jim Blandy <jimb@redhat.com>
parents:
1160
diff
changeset
|
897 |
25662
0a7261c1d487
Use XCAR, XCDR, and XFLOAT_DATA instead of explicit member access.
Ken Raeburn <raeburn@raeburn.org>
parents:
25600
diff
changeset
|
898 elt = XCAR (tail); |
9973
1d5a908f201e
(access_keymap): Use type test macros.
Karl Heuer <kwzh@gnu.org>
parents:
9957
diff
changeset
|
899 if (VECTORP (elt)) |
1209
1aa2cd425737
* keymap.c (DENSE_TABLE_SIZE): Doc fix.
Jim Blandy <jimb@redhat.com>
parents:
1160
diff
changeset
|
900 { |
32846
c1b3ab2a1ccc
Use AREF, ASET and ASIZE macros.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
32844
diff
changeset
|
901 if (NATNUMP (idx) && XFASTINT (idx) < ASIZE (elt)) |
1209
1aa2cd425737
* keymap.c (DENSE_TABLE_SIZE): Doc fix.
Jim Blandy <jimb@redhat.com>
parents:
1160
diff
changeset
|
902 { |
67505
51053176f6b7
(Fset_keymap_parent, store_in_keymap): Use CHECK_IMPURE.
Richard M. Stallman <rms@gnu.org>
parents:
67259
diff
changeset
|
903 CHECK_IMPURE (elt); |
32846
c1b3ab2a1ccc
Use AREF, ASET and ASIZE macros.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
32844
diff
changeset
|
904 ASET (elt, XFASTINT (idx), def); |
1209
1aa2cd425737
* keymap.c (DENSE_TABLE_SIZE): Doc fix.
Jim Blandy <jimb@redhat.com>
parents:
1160
diff
changeset
|
905 return def; |
1aa2cd425737
* keymap.c (DENSE_TABLE_SIZE): Doc fix.
Jim Blandy <jimb@redhat.com>
parents:
1160
diff
changeset
|
906 } |
89655
c7f2621e0e2d
(store_in_keymap): Pay attention to the case that idx is a cons
Kenichi Handa <handa@m17n.org>
parents:
89640
diff
changeset
|
907 else if (CONSP (idx) && CHARACTERP (XCAR (idx))) |
c7f2621e0e2d
(store_in_keymap): Pay attention to the case that idx is a cons
Kenichi Handa <handa@m17n.org>
parents:
89640
diff
changeset
|
908 { |
c7f2621e0e2d
(store_in_keymap): Pay attention to the case that idx is a cons
Kenichi Handa <handa@m17n.org>
parents:
89640
diff
changeset
|
909 int from = XFASTINT (XCAR (idx)); |
c7f2621e0e2d
(store_in_keymap): Pay attention to the case that idx is a cons
Kenichi Handa <handa@m17n.org>
parents:
89640
diff
changeset
|
910 int to = XFASTINT (XCDR (idx)); |
c7f2621e0e2d
(store_in_keymap): Pay attention to the case that idx is a cons
Kenichi Handa <handa@m17n.org>
parents:
89640
diff
changeset
|
911 |
c7f2621e0e2d
(store_in_keymap): Pay attention to the case that idx is a cons
Kenichi Handa <handa@m17n.org>
parents:
89640
diff
changeset
|
912 if (to >= ASIZE (elt)) |
c7f2621e0e2d
(store_in_keymap): Pay attention to the case that idx is a cons
Kenichi Handa <handa@m17n.org>
parents:
89640
diff
changeset
|
913 to = ASIZE (elt) - 1; |
c7f2621e0e2d
(store_in_keymap): Pay attention to the case that idx is a cons
Kenichi Handa <handa@m17n.org>
parents:
89640
diff
changeset
|
914 for (; from <= to; from++) |
c7f2621e0e2d
(store_in_keymap): Pay attention to the case that idx is a cons
Kenichi Handa <handa@m17n.org>
parents:
89640
diff
changeset
|
915 ASET (elt, from, def); |
c7f2621e0e2d
(store_in_keymap): Pay attention to the case that idx is a cons
Kenichi Handa <handa@m17n.org>
parents:
89640
diff
changeset
|
916 if (to == XFASTINT (XCDR (idx))) |
c7f2621e0e2d
(store_in_keymap): Pay attention to the case that idx is a cons
Kenichi Handa <handa@m17n.org>
parents:
89640
diff
changeset
|
917 /* We have defined all keys in IDX. */ |
c7f2621e0e2d
(store_in_keymap): Pay attention to the case that idx is a cons
Kenichi Handa <handa@m17n.org>
parents:
89640
diff
changeset
|
918 return def; |
c7f2621e0e2d
(store_in_keymap): Pay attention to the case that idx is a cons
Kenichi Handa <handa@m17n.org>
parents:
89640
diff
changeset
|
919 } |
1209
1aa2cd425737
* keymap.c (DENSE_TABLE_SIZE): Doc fix.
Jim Blandy <jimb@redhat.com>
parents:
1160
diff
changeset
|
920 insertion_point = tail; |
9973
1d5a908f201e
(access_keymap): Use type test macros.
Karl Heuer <kwzh@gnu.org>
parents:
9957
diff
changeset
|
921 } |
17788
208d71ea3a4f
(get_keyelt): Handle an indirect entry with meta char.
Richard M. Stallman <rms@gnu.org>
parents:
17511
diff
changeset
|
922 else if (CHAR_TABLE_P (elt)) |
208d71ea3a4f
(get_keyelt): Handle an indirect entry with meta char.
Richard M. Stallman <rms@gnu.org>
parents:
17511
diff
changeset
|
923 { |
17932
78a128b99e05
(access_keymap, store_in_keymap): Don't look in a char-table
Richard M. Stallman <rms@gnu.org>
parents:
17861
diff
changeset
|
924 /* Character codes with modifiers |
78a128b99e05
(access_keymap, store_in_keymap): Don't look in a char-table
Richard M. Stallman <rms@gnu.org>
parents:
17861
diff
changeset
|
925 are not included in a char-table. |
78a128b99e05
(access_keymap, store_in_keymap): Don't look in a char-table
Richard M. Stallman <rms@gnu.org>
parents:
17861
diff
changeset
|
926 All character codes without modifiers are included. */ |
41593
bc65be224d92
(access_keymap): Handle t bindings like nil bindings.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
41387
diff
changeset
|
927 if (NATNUMP (idx) && !(XFASTINT (idx) & CHAR_MODIFIER_MASK)) |
17788
208d71ea3a4f
(get_keyelt): Handle an indirect entry with meta char.
Richard M. Stallman <rms@gnu.org>
parents:
17511
diff
changeset
|
928 { |
41593
bc65be224d92
(access_keymap): Handle t bindings like nil bindings.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
41387
diff
changeset
|
929 Faset (elt, idx, |
bc65be224d92
(access_keymap): Handle t bindings like nil bindings.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
41387
diff
changeset
|
930 /* `nil' has a special meaning for char-tables, so |
bc65be224d92
(access_keymap): Handle t bindings like nil bindings.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
41387
diff
changeset
|
931 we use something else to record an explicitly |
bc65be224d92
(access_keymap): Handle t bindings like nil bindings.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
41387
diff
changeset
|
932 unbound entry. */ |
bc65be224d92
(access_keymap): Handle t bindings like nil bindings.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
41387
diff
changeset
|
933 NILP (def) ? Qt : def); |
17788
208d71ea3a4f
(get_keyelt): Handle an indirect entry with meta char.
Richard M. Stallman <rms@gnu.org>
parents:
17511
diff
changeset
|
934 return def; |
208d71ea3a4f
(get_keyelt): Handle an indirect entry with meta char.
Richard M. Stallman <rms@gnu.org>
parents:
17511
diff
changeset
|
935 } |
88380 | 936 else if (CONSP (idx) && CHARACTERP (XCAR (idx))) |
937 { | |
938 Fset_char_table_range (elt, idx, NILP (def) ? Qt : def); | |
939 return def; | |
940 } | |
17788
208d71ea3a4f
(get_keyelt): Handle an indirect entry with meta char.
Richard M. Stallman <rms@gnu.org>
parents:
17511
diff
changeset
|
941 insertion_point = tail; |
208d71ea3a4f
(get_keyelt): Handle an indirect entry with meta char.
Richard M. Stallman <rms@gnu.org>
parents:
17511
diff
changeset
|
942 } |
9973
1d5a908f201e
(access_keymap): Use type test macros.
Karl Heuer <kwzh@gnu.org>
parents:
9957
diff
changeset
|
943 else if (CONSP (elt)) |
1d5a908f201e
(access_keymap): Use type test macros.
Karl Heuer <kwzh@gnu.org>
parents:
9957
diff
changeset
|
944 { |
25662
0a7261c1d487
Use XCAR, XCDR, and XFLOAT_DATA instead of explicit member access.
Ken Raeburn <raeburn@raeburn.org>
parents:
25600
diff
changeset
|
945 if (EQ (idx, XCAR (elt))) |
1209
1aa2cd425737
* keymap.c (DENSE_TABLE_SIZE): Doc fix.
Jim Blandy <jimb@redhat.com>
parents:
1160
diff
changeset
|
946 { |
67505
51053176f6b7
(Fset_keymap_parent, store_in_keymap): Use CHECK_IMPURE.
Richard M. Stallman <rms@gnu.org>
parents:
67259
diff
changeset
|
947 CHECK_IMPURE (elt); |
39973
579177964efa
Avoid (most) uses of XCAR/XCDR as lvalues, for flexibility in experimenting
Ken Raeburn <raeburn@raeburn.org>
parents:
39940
diff
changeset
|
948 XSETCDR (elt, def); |
1209
1aa2cd425737
* keymap.c (DENSE_TABLE_SIZE): Doc fix.
Jim Blandy <jimb@redhat.com>
parents:
1160
diff
changeset
|
949 return def; |
1aa2cd425737
* keymap.c (DENSE_TABLE_SIZE): Doc fix.
Jim Blandy <jimb@redhat.com>
parents:
1160
diff
changeset
|
950 } |
89655
c7f2621e0e2d
(store_in_keymap): Pay attention to the case that idx is a cons
Kenichi Handa <handa@m17n.org>
parents:
89640
diff
changeset
|
951 else if (CONSP (idx) && CHARACTERP (XCAR (idx))) |
c7f2621e0e2d
(store_in_keymap): Pay attention to the case that idx is a cons
Kenichi Handa <handa@m17n.org>
parents:
89640
diff
changeset
|
952 { |
c7f2621e0e2d
(store_in_keymap): Pay attention to the case that idx is a cons
Kenichi Handa <handa@m17n.org>
parents:
89640
diff
changeset
|
953 int from = XFASTINT (XCAR (idx)); |
c7f2621e0e2d
(store_in_keymap): Pay attention to the case that idx is a cons
Kenichi Handa <handa@m17n.org>
parents:
89640
diff
changeset
|
954 int to = XFASTINT (XCDR (idx)); |
c7f2621e0e2d
(store_in_keymap): Pay attention to the case that idx is a cons
Kenichi Handa <handa@m17n.org>
parents:
89640
diff
changeset
|
955 |
c7f2621e0e2d
(store_in_keymap): Pay attention to the case that idx is a cons
Kenichi Handa <handa@m17n.org>
parents:
89640
diff
changeset
|
956 if (from <= XFASTINT (XCAR (elt)) |
c7f2621e0e2d
(store_in_keymap): Pay attention to the case that idx is a cons
Kenichi Handa <handa@m17n.org>
parents:
89640
diff
changeset
|
957 && to >= XFASTINT (XCAR (elt))) |
c7f2621e0e2d
(store_in_keymap): Pay attention to the case that idx is a cons
Kenichi Handa <handa@m17n.org>
parents:
89640
diff
changeset
|
958 { |
c7f2621e0e2d
(store_in_keymap): Pay attention to the case that idx is a cons
Kenichi Handa <handa@m17n.org>
parents:
89640
diff
changeset
|
959 XSETCDR (elt, def); |
c7f2621e0e2d
(store_in_keymap): Pay attention to the case that idx is a cons
Kenichi Handa <handa@m17n.org>
parents:
89640
diff
changeset
|
960 if (from == to) |
c7f2621e0e2d
(store_in_keymap): Pay attention to the case that idx is a cons
Kenichi Handa <handa@m17n.org>
parents:
89640
diff
changeset
|
961 return def; |
c7f2621e0e2d
(store_in_keymap): Pay attention to the case that idx is a cons
Kenichi Handa <handa@m17n.org>
parents:
89640
diff
changeset
|
962 } |
c7f2621e0e2d
(store_in_keymap): Pay attention to the case that idx is a cons
Kenichi Handa <handa@m17n.org>
parents:
89640
diff
changeset
|
963 } |
9973
1d5a908f201e
(access_keymap): Use type test macros.
Karl Heuer <kwzh@gnu.org>
parents:
9957
diff
changeset
|
964 } |
32846
c1b3ab2a1ccc
Use AREF, ASET and ASIZE macros.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
32844
diff
changeset
|
965 else if (EQ (elt, Qkeymap)) |
c1b3ab2a1ccc
Use AREF, ASET and ASIZE macros.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
32844
diff
changeset
|
966 /* If we find a 'keymap' symbol in the spine of KEYMAP, |
c1b3ab2a1ccc
Use AREF, ASET and ASIZE macros.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
32844
diff
changeset
|
967 then we must have found the start of a second keymap |
c1b3ab2a1ccc
Use AREF, ASET and ASIZE macros.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
32844
diff
changeset
|
968 being used as the tail of KEYMAP, and a binding for IDX |
c1b3ab2a1ccc
Use AREF, ASET and ASIZE macros.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
32844
diff
changeset
|
969 should be inserted before it. */ |
c1b3ab2a1ccc
Use AREF, ASET and ASIZE macros.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
32844
diff
changeset
|
970 goto keymap_end; |
1441
929409595312
* keymap.c (store_in_keymap): Don't forget to QUIT in the
Jim Blandy <jimb@redhat.com>
parents:
1388
diff
changeset
|
971 |
929409595312
* keymap.c (store_in_keymap): Don't forget to QUIT in the
Jim Blandy <jimb@redhat.com>
parents:
1388
diff
changeset
|
972 QUIT; |
250 | 973 } |
1209
1aa2cd425737
* keymap.c (DENSE_TABLE_SIZE): Doc fix.
Jim Blandy <jimb@redhat.com>
parents:
1160
diff
changeset
|
974 |
1aa2cd425737
* keymap.c (DENSE_TABLE_SIZE): Doc fix.
Jim Blandy <jimb@redhat.com>
parents:
1160
diff
changeset
|
975 keymap_end: |
1aa2cd425737
* keymap.c (DENSE_TABLE_SIZE): Doc fix.
Jim Blandy <jimb@redhat.com>
parents:
1160
diff
changeset
|
976 /* We have scanned the entire keymap, and not found a binding for |
1aa2cd425737
* keymap.c (DENSE_TABLE_SIZE): Doc fix.
Jim Blandy <jimb@redhat.com>
parents:
1160
diff
changeset
|
977 IDX. Let's add one. */ |
89655
c7f2621e0e2d
(store_in_keymap): Pay attention to the case that idx is a cons
Kenichi Handa <handa@m17n.org>
parents:
89640
diff
changeset
|
978 { |
c7f2621e0e2d
(store_in_keymap): Pay attention to the case that idx is a cons
Kenichi Handa <handa@m17n.org>
parents:
89640
diff
changeset
|
979 Lisp_Object elt; |
c7f2621e0e2d
(store_in_keymap): Pay attention to the case that idx is a cons
Kenichi Handa <handa@m17n.org>
parents:
89640
diff
changeset
|
980 |
c7f2621e0e2d
(store_in_keymap): Pay attention to the case that idx is a cons
Kenichi Handa <handa@m17n.org>
parents:
89640
diff
changeset
|
981 if (CONSP (idx) && CHARACTERP (XCAR (idx))) |
c7f2621e0e2d
(store_in_keymap): Pay attention to the case that idx is a cons
Kenichi Handa <handa@m17n.org>
parents:
89640
diff
changeset
|
982 { |
c7f2621e0e2d
(store_in_keymap): Pay attention to the case that idx is a cons
Kenichi Handa <handa@m17n.org>
parents:
89640
diff
changeset
|
983 /* IDX specifies a range of characters, and not all of them |
c7f2621e0e2d
(store_in_keymap): Pay attention to the case that idx is a cons
Kenichi Handa <handa@m17n.org>
parents:
89640
diff
changeset
|
984 were handled yet, which means this keymap doesn't have a |
c7f2621e0e2d
(store_in_keymap): Pay attention to the case that idx is a cons
Kenichi Handa <handa@m17n.org>
parents:
89640
diff
changeset
|
985 char-table. So, we insert a char-table now. */ |
c7f2621e0e2d
(store_in_keymap): Pay attention to the case that idx is a cons
Kenichi Handa <handa@m17n.org>
parents:
89640
diff
changeset
|
986 elt = Fmake_char_table (Qkeymap, Qnil); |
c7f2621e0e2d
(store_in_keymap): Pay attention to the case that idx is a cons
Kenichi Handa <handa@m17n.org>
parents:
89640
diff
changeset
|
987 Fset_char_table_range (elt, idx, NILP (def) ? Qt : def); |
c7f2621e0e2d
(store_in_keymap): Pay attention to the case that idx is a cons
Kenichi Handa <handa@m17n.org>
parents:
89640
diff
changeset
|
988 } |
c7f2621e0e2d
(store_in_keymap): Pay attention to the case that idx is a cons
Kenichi Handa <handa@m17n.org>
parents:
89640
diff
changeset
|
989 else |
c7f2621e0e2d
(store_in_keymap): Pay attention to the case that idx is a cons
Kenichi Handa <handa@m17n.org>
parents:
89640
diff
changeset
|
990 elt = Fcons (idx, def); |
90261
7beb78bc1f8e
Revision: miles@gnu.org--gnu-2005/emacs--unicode--0--patch-97
Miles Bader <miles@gnu.org>
diff
changeset
|
991 CHECK_IMPURE (insertion_point); |
89655
c7f2621e0e2d
(store_in_keymap): Pay attention to the case that idx is a cons
Kenichi Handa <handa@m17n.org>
parents:
89640
diff
changeset
|
992 XSETCDR (insertion_point, Fcons (elt, XCDR (insertion_point))); |
c7f2621e0e2d
(store_in_keymap): Pay attention to the case that idx is a cons
Kenichi Handa <handa@m17n.org>
parents:
89640
diff
changeset
|
993 } |
250 | 994 } |
45279
220c13a65624
(keymap_parent): New fun, extracted from Fkeymap_parent.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
45235
diff
changeset
|
995 |
250 | 996 return def; |
997 } | |
998 | |
39837
ccaa40660e40
(Fkey_description): Use empty_string.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
39702
diff
changeset
|
999 EXFUN (Fcopy_keymap, 1); |
ccaa40660e40
(Fkey_description): Use empty_string.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
39702
diff
changeset
|
1000 |
45279
220c13a65624
(keymap_parent): New fun, extracted from Fkeymap_parent.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
45235
diff
changeset
|
1001 Lisp_Object |
109126
aec1143e8d85
Convert (most) functions in src to standard C.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
109100
diff
changeset
|
1002 copy_keymap_item (Lisp_Object elt) |
45279
220c13a65624
(keymap_parent): New fun, extracted from Fkeymap_parent.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
45235
diff
changeset
|
1003 { |
220c13a65624
(keymap_parent): New fun, extracted from Fkeymap_parent.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
45235
diff
changeset
|
1004 Lisp_Object res, tem; |
220c13a65624
(keymap_parent): New fun, extracted from Fkeymap_parent.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
45235
diff
changeset
|
1005 |
220c13a65624
(keymap_parent): New fun, extracted from Fkeymap_parent.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
45235
diff
changeset
|
1006 if (!CONSP (elt)) |
220c13a65624
(keymap_parent): New fun, extracted from Fkeymap_parent.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
45235
diff
changeset
|
1007 return elt; |
220c13a65624
(keymap_parent): New fun, extracted from Fkeymap_parent.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
45235
diff
changeset
|
1008 |
220c13a65624
(keymap_parent): New fun, extracted from Fkeymap_parent.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
45235
diff
changeset
|
1009 res = tem = elt; |
220c13a65624
(keymap_parent): New fun, extracted from Fkeymap_parent.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
45235
diff
changeset
|
1010 |
220c13a65624
(keymap_parent): New fun, extracted from Fkeymap_parent.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
45235
diff
changeset
|
1011 /* Is this a new format menu item. */ |
220c13a65624
(keymap_parent): New fun, extracted from Fkeymap_parent.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
45235
diff
changeset
|
1012 if (EQ (XCAR (tem), Qmenu_item)) |
220c13a65624
(keymap_parent): New fun, extracted from Fkeymap_parent.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
45235
diff
changeset
|
1013 { |
220c13a65624
(keymap_parent): New fun, extracted from Fkeymap_parent.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
45235
diff
changeset
|
1014 /* Copy cell with menu-item marker. */ |
220c13a65624
(keymap_parent): New fun, extracted from Fkeymap_parent.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
45235
diff
changeset
|
1015 res = elt = Fcons (XCAR (tem), XCDR (tem)); |
220c13a65624
(keymap_parent): New fun, extracted from Fkeymap_parent.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
45235
diff
changeset
|
1016 tem = XCDR (elt); |
220c13a65624
(keymap_parent): New fun, extracted from Fkeymap_parent.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
45235
diff
changeset
|
1017 if (CONSP (tem)) |
220c13a65624
(keymap_parent): New fun, extracted from Fkeymap_parent.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
45235
diff
changeset
|
1018 { |
220c13a65624
(keymap_parent): New fun, extracted from Fkeymap_parent.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
45235
diff
changeset
|
1019 /* Copy cell with menu-item name. */ |
220c13a65624
(keymap_parent): New fun, extracted from Fkeymap_parent.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
45235
diff
changeset
|
1020 XSETCDR (elt, Fcons (XCAR (tem), XCDR (tem))); |
220c13a65624
(keymap_parent): New fun, extracted from Fkeymap_parent.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
45235
diff
changeset
|
1021 elt = XCDR (elt); |
220c13a65624
(keymap_parent): New fun, extracted from Fkeymap_parent.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
45235
diff
changeset
|
1022 tem = XCDR (elt); |
220c13a65624
(keymap_parent): New fun, extracted from Fkeymap_parent.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
45235
diff
changeset
|
1023 } |
220c13a65624
(keymap_parent): New fun, extracted from Fkeymap_parent.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
45235
diff
changeset
|
1024 if (CONSP (tem)) |
220c13a65624
(keymap_parent): New fun, extracted from Fkeymap_parent.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
45235
diff
changeset
|
1025 { |
220c13a65624
(keymap_parent): New fun, extracted from Fkeymap_parent.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
45235
diff
changeset
|
1026 /* Copy cell with binding and if the binding is a keymap, |
220c13a65624
(keymap_parent): New fun, extracted from Fkeymap_parent.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
45235
diff
changeset
|
1027 copy that. */ |
220c13a65624
(keymap_parent): New fun, extracted from Fkeymap_parent.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
45235
diff
changeset
|
1028 XSETCDR (elt, Fcons (XCAR (tem), XCDR (tem))); |
220c13a65624
(keymap_parent): New fun, extracted from Fkeymap_parent.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
45235
diff
changeset
|
1029 elt = XCDR (elt); |
220c13a65624
(keymap_parent): New fun, extracted from Fkeymap_parent.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
45235
diff
changeset
|
1030 tem = XCAR (elt); |
220c13a65624
(keymap_parent): New fun, extracted from Fkeymap_parent.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
45235
diff
changeset
|
1031 if (CONSP (tem) && EQ (XCAR (tem), Qkeymap)) |
220c13a65624
(keymap_parent): New fun, extracted from Fkeymap_parent.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
45235
diff
changeset
|
1032 XSETCAR (elt, Fcopy_keymap (tem)); |
220c13a65624
(keymap_parent): New fun, extracted from Fkeymap_parent.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
45235
diff
changeset
|
1033 tem = XCDR (elt); |
220c13a65624
(keymap_parent): New fun, extracted from Fkeymap_parent.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
45235
diff
changeset
|
1034 if (CONSP (tem) && CONSP (XCAR (tem))) |
220c13a65624
(keymap_parent): New fun, extracted from Fkeymap_parent.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
45235
diff
changeset
|
1035 /* Delete cache for key equivalences. */ |
220c13a65624
(keymap_parent): New fun, extracted from Fkeymap_parent.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
45235
diff
changeset
|
1036 XSETCDR (elt, XCDR (tem)); |
220c13a65624
(keymap_parent): New fun, extracted from Fkeymap_parent.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
45235
diff
changeset
|
1037 } |
220c13a65624
(keymap_parent): New fun, extracted from Fkeymap_parent.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
45235
diff
changeset
|
1038 } |
220c13a65624
(keymap_parent): New fun, extracted from Fkeymap_parent.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
45235
diff
changeset
|
1039 else |
220c13a65624
(keymap_parent): New fun, extracted from Fkeymap_parent.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
45235
diff
changeset
|
1040 { |
220c13a65624
(keymap_parent): New fun, extracted from Fkeymap_parent.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
45235
diff
changeset
|
1041 /* It may be an old fomat menu item. |
220c13a65624
(keymap_parent): New fun, extracted from Fkeymap_parent.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
45235
diff
changeset
|
1042 Skip the optional menu string. */ |
220c13a65624
(keymap_parent): New fun, extracted from Fkeymap_parent.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
45235
diff
changeset
|
1043 if (STRINGP (XCAR (tem))) |
220c13a65624
(keymap_parent): New fun, extracted from Fkeymap_parent.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
45235
diff
changeset
|
1044 { |
220c13a65624
(keymap_parent): New fun, extracted from Fkeymap_parent.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
45235
diff
changeset
|
1045 /* Copy the cell, since copy-alist didn't go this deep. */ |
220c13a65624
(keymap_parent): New fun, extracted from Fkeymap_parent.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
45235
diff
changeset
|
1046 res = elt = Fcons (XCAR (tem), XCDR (tem)); |
220c13a65624
(keymap_parent): New fun, extracted from Fkeymap_parent.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
45235
diff
changeset
|
1047 tem = XCDR (elt); |
220c13a65624
(keymap_parent): New fun, extracted from Fkeymap_parent.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
45235
diff
changeset
|
1048 /* Also skip the optional menu help string. */ |
220c13a65624
(keymap_parent): New fun, extracted from Fkeymap_parent.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
45235
diff
changeset
|
1049 if (CONSP (tem) && STRINGP (XCAR (tem))) |
220c13a65624
(keymap_parent): New fun, extracted from Fkeymap_parent.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
45235
diff
changeset
|
1050 { |
220c13a65624
(keymap_parent): New fun, extracted from Fkeymap_parent.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
45235
diff
changeset
|
1051 XSETCDR (elt, Fcons (XCAR (tem), XCDR (tem))); |
220c13a65624
(keymap_parent): New fun, extracted from Fkeymap_parent.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
45235
diff
changeset
|
1052 elt = XCDR (elt); |
220c13a65624
(keymap_parent): New fun, extracted from Fkeymap_parent.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
45235
diff
changeset
|
1053 tem = XCDR (elt); |
220c13a65624
(keymap_parent): New fun, extracted from Fkeymap_parent.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
45235
diff
changeset
|
1054 } |
220c13a65624
(keymap_parent): New fun, extracted from Fkeymap_parent.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
45235
diff
changeset
|
1055 /* There may also be a list that caches key equivalences. |
220c13a65624
(keymap_parent): New fun, extracted from Fkeymap_parent.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
45235
diff
changeset
|
1056 Just delete it for the new keymap. */ |
220c13a65624
(keymap_parent): New fun, extracted from Fkeymap_parent.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
45235
diff
changeset
|
1057 if (CONSP (tem) |
220c13a65624
(keymap_parent): New fun, extracted from Fkeymap_parent.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
45235
diff
changeset
|
1058 && CONSP (XCAR (tem)) |
220c13a65624
(keymap_parent): New fun, extracted from Fkeymap_parent.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
45235
diff
changeset
|
1059 && (NILP (XCAR (XCAR (tem))) |
220c13a65624
(keymap_parent): New fun, extracted from Fkeymap_parent.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
45235
diff
changeset
|
1060 || VECTORP (XCAR (XCAR (tem))))) |
220c13a65624
(keymap_parent): New fun, extracted from Fkeymap_parent.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
45235
diff
changeset
|
1061 { |
220c13a65624
(keymap_parent): New fun, extracted from Fkeymap_parent.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
45235
diff
changeset
|
1062 XSETCDR (elt, XCDR (tem)); |
220c13a65624
(keymap_parent): New fun, extracted from Fkeymap_parent.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
45235
diff
changeset
|
1063 tem = XCDR (tem); |
220c13a65624
(keymap_parent): New fun, extracted from Fkeymap_parent.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
45235
diff
changeset
|
1064 } |
220c13a65624
(keymap_parent): New fun, extracted from Fkeymap_parent.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
45235
diff
changeset
|
1065 if (CONSP (tem) && EQ (XCAR (tem), Qkeymap)) |
220c13a65624
(keymap_parent): New fun, extracted from Fkeymap_parent.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
45235
diff
changeset
|
1066 XSETCDR (elt, Fcopy_keymap (tem)); |
220c13a65624
(keymap_parent): New fun, extracted from Fkeymap_parent.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
45235
diff
changeset
|
1067 } |
220c13a65624
(keymap_parent): New fun, extracted from Fkeymap_parent.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
45235
diff
changeset
|
1068 else if (EQ (XCAR (tem), Qkeymap)) |
220c13a65624
(keymap_parent): New fun, extracted from Fkeymap_parent.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
45235
diff
changeset
|
1069 res = Fcopy_keymap (elt); |
220c13a65624
(keymap_parent): New fun, extracted from Fkeymap_parent.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
45235
diff
changeset
|
1070 } |
220c13a65624
(keymap_parent): New fun, extracted from Fkeymap_parent.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
45235
diff
changeset
|
1071 return res; |
220c13a65624
(keymap_parent): New fun, extracted from Fkeymap_parent.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
45235
diff
changeset
|
1072 } |
220c13a65624
(keymap_parent): New fun, extracted from Fkeymap_parent.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
45235
diff
changeset
|
1073 |
49912
e9f8f5a9cef6
(copy_keymap_1): Make it static.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49902
diff
changeset
|
1074 static void |
109126
aec1143e8d85
Convert (most) functions in src to standard C.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
109100
diff
changeset
|
1075 copy_keymap_1 (Lisp_Object chartable, Lisp_Object idx, Lisp_Object elt) |
17788
208d71ea3a4f
(get_keyelt): Handle an indirect entry with meta char.
Richard M. Stallman <rms@gnu.org>
parents:
17511
diff
changeset
|
1076 { |
89483 | 1077 Fset_char_table_range (chartable, idx, copy_keymap_item (elt)); |
17788
208d71ea3a4f
(get_keyelt): Handle an indirect entry with meta char.
Richard M. Stallman <rms@gnu.org>
parents:
17511
diff
changeset
|
1078 } |
1209
1aa2cd425737
* keymap.c (DENSE_TABLE_SIZE): Doc fix.
Jim Blandy <jimb@redhat.com>
parents:
1160
diff
changeset
|
1079 |
250 | 1080 DEFUN ("copy-keymap", Fcopy_keymap, Scopy_keymap, 1, 1, 0, |
41001
a17c8b15ef1b
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
40804
diff
changeset
|
1081 doc: /* Return a copy of the keymap KEYMAP. |
a17c8b15ef1b
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
40804
diff
changeset
|
1082 The copy starts out with the same definitions of KEYMAP, |
a17c8b15ef1b
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
40804
diff
changeset
|
1083 but changing either the copy or KEYMAP does not affect the other. |
a17c8b15ef1b
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
40804
diff
changeset
|
1084 Any key definitions that are subkeymaps are recursively copied. |
a17c8b15ef1b
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
40804
diff
changeset
|
1085 However, a key definition which is a symbol whose definition is a keymap |
a17c8b15ef1b
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
40804
diff
changeset
|
1086 is not copied. */) |
109179
8cfee7d2955f
Convert DEFUNs to standard C.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
109165
diff
changeset
|
1087 (Lisp_Object keymap) |
250 | 1088 { |
1089 register Lisp_Object copy, tail; | |
45279
220c13a65624
(keymap_parent): New fun, extracted from Fkeymap_parent.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
45235
diff
changeset
|
1090 keymap = get_keymap (keymap, 1, 0); |
220c13a65624
(keymap_parent): New fun, extracted from Fkeymap_parent.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
45235
diff
changeset
|
1091 copy = tail = Fcons (Qkeymap, Qnil); |
220c13a65624
(keymap_parent): New fun, extracted from Fkeymap_parent.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
45235
diff
changeset
|
1092 keymap = XCDR (keymap); /* Skip the `keymap' symbol. */ |
220c13a65624
(keymap_parent): New fun, extracted from Fkeymap_parent.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
45235
diff
changeset
|
1093 |
220c13a65624
(keymap_parent): New fun, extracted from Fkeymap_parent.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
45235
diff
changeset
|
1094 while (CONSP (keymap) && !EQ (XCAR (keymap), Qkeymap)) |
250 | 1095 { |
45279
220c13a65624
(keymap_parent): New fun, extracted from Fkeymap_parent.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
45235
diff
changeset
|
1096 Lisp_Object elt = XCAR (keymap); |
17788
208d71ea3a4f
(get_keyelt): Handle an indirect entry with meta char.
Richard M. Stallman <rms@gnu.org>
parents:
17511
diff
changeset
|
1097 if (CHAR_TABLE_P (elt)) |
208d71ea3a4f
(get_keyelt): Handle an indirect entry with meta char.
Richard M. Stallman <rms@gnu.org>
parents:
17511
diff
changeset
|
1098 { |
208d71ea3a4f
(get_keyelt): Handle an indirect entry with meta char.
Richard M. Stallman <rms@gnu.org>
parents:
17511
diff
changeset
|
1099 elt = Fcopy_sequence (elt); |
89483 | 1100 map_char_table (copy_keymap_1, Qnil, elt, elt); |
17788
208d71ea3a4f
(get_keyelt): Handle an indirect entry with meta char.
Richard M. Stallman <rms@gnu.org>
parents:
17511
diff
changeset
|
1101 } |
208d71ea3a4f
(get_keyelt): Handle an indirect entry with meta char.
Richard M. Stallman <rms@gnu.org>
parents:
17511
diff
changeset
|
1102 else if (VECTORP (elt)) |
250 | 1103 { |
1209
1aa2cd425737
* keymap.c (DENSE_TABLE_SIZE): Doc fix.
Jim Blandy <jimb@redhat.com>
parents:
1160
diff
changeset
|
1104 int i; |
1aa2cd425737
* keymap.c (DENSE_TABLE_SIZE): Doc fix.
Jim Blandy <jimb@redhat.com>
parents:
1160
diff
changeset
|
1105 elt = Fcopy_sequence (elt); |
32846
c1b3ab2a1ccc
Use AREF, ASET and ASIZE macros.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
32844
diff
changeset
|
1106 for (i = 0; i < ASIZE (elt); i++) |
45279
220c13a65624
(keymap_parent): New fun, extracted from Fkeymap_parent.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
45235
diff
changeset
|
1107 ASET (elt, i, copy_keymap_item (AREF (elt, i))); |
250 | 1108 } |
45279
220c13a65624
(keymap_parent): New fun, extracted from Fkeymap_parent.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
45235
diff
changeset
|
1109 else if (CONSP (elt)) |
220c13a65624
(keymap_parent): New fun, extracted from Fkeymap_parent.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
45235
diff
changeset
|
1110 elt = Fcons (XCAR (elt), copy_keymap_item (XCDR (elt))); |
220c13a65624
(keymap_parent): New fun, extracted from Fkeymap_parent.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
45235
diff
changeset
|
1111 XSETCDR (tail, Fcons (elt, Qnil)); |
220c13a65624
(keymap_parent): New fun, extracted from Fkeymap_parent.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
45235
diff
changeset
|
1112 tail = XCDR (tail); |
220c13a65624
(keymap_parent): New fun, extracted from Fkeymap_parent.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
45235
diff
changeset
|
1113 keymap = XCDR (keymap); |
250 | 1114 } |
45279
220c13a65624
(keymap_parent): New fun, extracted from Fkeymap_parent.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
45235
diff
changeset
|
1115 XSETCDR (tail, keymap); |
250 | 1116 return copy; |
1117 } | |
1118 | |
465 | 1119 /* Simple Keymap mutators and accessors. */ |
1120 | |
7998
d4b5f4dd9c51
(Flookup_key): Add gcpro.
Richard M. Stallman <rms@gnu.org>
parents:
7894
diff
changeset
|
1121 /* GC is possible in this function if it autoloads a keymap. */ |
d4b5f4dd9c51
(Flookup_key): Add gcpro.
Richard M. Stallman <rms@gnu.org>
parents:
7894
diff
changeset
|
1122 |
250 | 1123 DEFUN ("define-key", Fdefine_key, Sdefine_key, 3, 3, 0, |
49902
7efa3eeb04ec
(Fdefine_key): Clarification of formulation.
Kai Großjohann <kgrossjo@eu.uu.net>
parents:
49901
diff
changeset
|
1124 doc: /* In KEYMAP, define key sequence KEY as DEF. |
43152
0029b0259426
(Fdefine_key): Allow symbol as KEY argument for
Kim F. Storm <storm@cua.dk>
parents:
42510
diff
changeset
|
1125 KEYMAP is a keymap. |
0029b0259426
(Fdefine_key): Allow symbol as KEY argument for
Kim F. Storm <storm@cua.dk>
parents:
42510
diff
changeset
|
1126 |
109246
d657dd1ad387
* keymap.c (Fdefine_key): Doc fix (Bug#6460).
Chong Yidong <cyd@stupidchicken.com>
parents:
108678
diff
changeset
|
1127 KEY is a string or a vector of symbols and characters, representing a |
43152
0029b0259426
(Fdefine_key): Allow symbol as KEY argument for
Kim F. Storm <storm@cua.dk>
parents:
42510
diff
changeset
|
1128 sequence of keystrokes and events. Non-ASCII characters with codes |
109246
d657dd1ad387
* keymap.c (Fdefine_key): Doc fix (Bug#6460).
Chong Yidong <cyd@stupidchicken.com>
parents:
108678
diff
changeset
|
1129 above 127 (such as ISO Latin-1) can be represented by vectors. |
d657dd1ad387
* keymap.c (Fdefine_key): Doc fix (Bug#6460).
Chong Yidong <cyd@stupidchicken.com>
parents:
108678
diff
changeset
|
1130 Two types of vector have special meanings: |
109302
60516122d066
Merge changes from emacs-23 branch.
Chong Yidong <cyd@stupidchicken.com>
diff
changeset
|
1131 [remap COMMAND] remaps any key binding for COMMAND. |
109246
d657dd1ad387
* keymap.c (Fdefine_key): Doc fix (Bug#6460).
Chong Yidong <cyd@stupidchicken.com>
parents:
108678
diff
changeset
|
1132 [t] creates a default definition, which applies to any event with no |
d657dd1ad387
* keymap.c (Fdefine_key): Doc fix (Bug#6460).
Chong Yidong <cyd@stupidchicken.com>
parents:
108678
diff
changeset
|
1133 other definition in KEYMAP. |
43152
0029b0259426
(Fdefine_key): Allow symbol as KEY argument for
Kim F. Storm <storm@cua.dk>
parents:
42510
diff
changeset
|
1134 |
41001
a17c8b15ef1b
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
40804
diff
changeset
|
1135 DEF is anything that can be a key's definition: |
a17c8b15ef1b
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
40804
diff
changeset
|
1136 nil (means key is undefined in this keymap), |
55722
623ab06bb37b
(Fdefine_key): Doc fix.
Juanma Barranquero <lekktu@gmail.com>
parents:
55006
diff
changeset
|
1137 a command (a Lisp function suitable for interactive calling), |
41001
a17c8b15ef1b
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
40804
diff
changeset
|
1138 a string (treated as a keyboard macro), |
a17c8b15ef1b
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
40804
diff
changeset
|
1139 a keymap (to define a prefix key), |
55722
623ab06bb37b
(Fdefine_key): Doc fix.
Juanma Barranquero <lekktu@gmail.com>
parents:
55006
diff
changeset
|
1140 a symbol (when the key is looked up, the symbol will stand for its |
41001
a17c8b15ef1b
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
40804
diff
changeset
|
1141 function definition, which should at that time be one of the above, |
55722
623ab06bb37b
(Fdefine_key): Doc fix.
Juanma Barranquero <lekktu@gmail.com>
parents:
55006
diff
changeset
|
1142 or another symbol whose function definition is used, etc.), |
41001
a17c8b15ef1b
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
40804
diff
changeset
|
1143 a cons (STRING . DEFN), meaning that DEFN is the definition |
a17c8b15ef1b
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
40804
diff
changeset
|
1144 (DEFN should be a valid definition in its own right), |
74975
489131611785
(Fdefine_key): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
74574
diff
changeset
|
1145 or a cons (MAP . CHAR), meaning use definition of CHAR in keymap MAP, |
77422
7ecfd3e438e0
(Fdefine_key): Minor doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
77367
diff
changeset
|
1146 or an extended menu item definition. |
7ecfd3e438e0
(Fdefine_key): Minor doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
77367
diff
changeset
|
1147 (See info node `(elisp)Extended Menu Items'.) |
41001
a17c8b15ef1b
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
40804
diff
changeset
|
1148 |
49901
71b3917cf40b
(Fdefine_key): Doc fix.
Kai Großjohann <kgrossjo@eu.uu.net>
parents:
49868
diff
changeset
|
1149 If KEYMAP is a sparse keymap with a binding for KEY, the existing |
71b3917cf40b
(Fdefine_key): Doc fix.
Kai Großjohann <kgrossjo@eu.uu.net>
parents:
49868
diff
changeset
|
1150 binding is altered. If there is no binding for KEY, the new pair |
71b3917cf40b
(Fdefine_key): Doc fix.
Kai Großjohann <kgrossjo@eu.uu.net>
parents:
49868
diff
changeset
|
1151 binding KEY to DEF is added at the front of KEYMAP. */) |
109179
8cfee7d2955f
Convert DEFUNs to standard C.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
109165
diff
changeset
|
1152 (Lisp_Object keymap, Lisp_Object key, Lisp_Object def) |
250 | 1153 { |
1154 register int idx; | |
1155 register Lisp_Object c; | |
1156 register Lisp_Object cmd; | |
1157 int metized = 0; | |
2059 | 1158 int meta_bit; |
250 | 1159 int length; |
1517
72b7bbcaf7d8
* keymap.c (Fdefine_key, Flookup_key, describe_map): Don't assume
Jim Blandy <jimb@redhat.com>
parents:
1441
diff
changeset
|
1160 struct gcpro gcpro1, gcpro2, gcpro3; |
250 | 1161 |
45279
220c13a65624
(keymap_parent): New fun, extracted from Fkeymap_parent.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
45235
diff
changeset
|
1162 GCPRO3 (keymap, key, def); |
32988
c3435dc00ed7
* lisp.h (KEYMAPP): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
32889
diff
changeset
|
1163 keymap = get_keymap (keymap, 1, 1); |
250 | 1164 |
71836
838fd2b04ce0
(Fdefine_key, Flookup_key): Use CHECK_VECTOR_OR_STRING.
Kim F. Storm <storm@cua.dk>
parents:
70554
diff
changeset
|
1165 CHECK_VECTOR_OR_STRING (key); |
250 | 1166 |
1517
72b7bbcaf7d8
* keymap.c (Fdefine_key, Flookup_key, describe_map): Don't assume
Jim Blandy <jimb@redhat.com>
parents:
1441
diff
changeset
|
1167 length = XFASTINT (Flength (key)); |
250 | 1168 if (length == 0) |
45279
220c13a65624
(keymap_parent): New fun, extracted from Fkeymap_parent.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
45235
diff
changeset
|
1169 RETURN_UNGCPRO (Qnil); |
43494
b5b76b498398
The following changes rework my patch of 2002-02-06 which
Kim F. Storm <storm@cua.dk>
parents:
43164
diff
changeset
|
1170 |
12297
fe458a8ecfa2
(Vdefine_key_rebound_commands): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
12262
diff
changeset
|
1171 if (SYMBOLP (def) && !EQ (Vdefine_key_rebound_commands, Qt)) |
fe458a8ecfa2
(Vdefine_key_rebound_commands): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
12262
diff
changeset
|
1172 Vdefine_key_rebound_commands = Fcons (def, Vdefine_key_rebound_commands); |
fe458a8ecfa2
(Vdefine_key_rebound_commands): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
12262
diff
changeset
|
1173 |
81792
4ee4f467ca51
(struct accessible_keymaps_data, struct where_is_internal_data): New structs.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
81609
diff
changeset
|
1174 meta_bit = (VECTORP (key) || (STRINGP (key) && STRING_MULTIBYTE (key)) |
80869
f526513aec92
(Fdefine_key, Flookup_key): Only do the 0x80->meta_modifier
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
77422
diff
changeset
|
1175 ? meta_modifier : 0x80); |
2059 | 1176 |
73152
645da5a91b56
(Fdefine_key): Yet another int/Lisp_Object mixup (YAILOM).
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73131
diff
changeset
|
1177 if (VECTORP (def) && ASIZE (def) > 0 && CONSP (AREF (def, 0))) |
72074
91ea8d22ef60
(Fdefine_key): If the key binding definition looks like an
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
71982
diff
changeset
|
1178 { /* DEF is apparently an XEmacs-style keyboard macro. */ |
91ea8d22ef60
(Fdefine_key): If the key binding definition looks like an
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
71982
diff
changeset
|
1179 Lisp_Object tmp = Fmake_vector (make_number (ASIZE (def)), Qnil); |
91ea8d22ef60
(Fdefine_key): If the key binding definition looks like an
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
71982
diff
changeset
|
1180 int i = ASIZE (def); |
91ea8d22ef60
(Fdefine_key): If the key binding definition looks like an
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
71982
diff
changeset
|
1181 while (--i >= 0) |
91ea8d22ef60
(Fdefine_key): If the key binding definition looks like an
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
71982
diff
changeset
|
1182 { |
91ea8d22ef60
(Fdefine_key): If the key binding definition looks like an
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
71982
diff
changeset
|
1183 Lisp_Object c = AREF (def, i); |
91ea8d22ef60
(Fdefine_key): If the key binding definition looks like an
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
71982
diff
changeset
|
1184 if (CONSP (c) && lucid_event_type_list_p (c)) |
91ea8d22ef60
(Fdefine_key): If the key binding definition looks like an
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
71982
diff
changeset
|
1185 c = Fevent_convert_list (c); |
91ea8d22ef60
(Fdefine_key): If the key binding definition looks like an
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
71982
diff
changeset
|
1186 ASET (tmp, i, c); |
91ea8d22ef60
(Fdefine_key): If the key binding definition looks like an
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
71982
diff
changeset
|
1187 } |
91ea8d22ef60
(Fdefine_key): If the key binding definition looks like an
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
71982
diff
changeset
|
1188 def = tmp; |
91ea8d22ef60
(Fdefine_key): If the key binding definition looks like an
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
71982
diff
changeset
|
1189 } |
91ea8d22ef60
(Fdefine_key): If the key binding definition looks like an
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
71982
diff
changeset
|
1190 |
250 | 1191 idx = 0; |
1192 while (1) | |
1193 { | |
1194 c = Faref (key, make_number (idx)); | |
1195 | |
88380 | 1196 if (CONSP (c)) |
1197 { | |
89626
e2d5f38e23b4
(Fdefine_key): Fix handling of Lucid style event type list.
Kenichi Handa <handa@m17n.org>
parents:
89551
diff
changeset
|
1198 /* C may be a Lucid style event type list or a cons (FROM . |
e2d5f38e23b4
(Fdefine_key): Fix handling of Lucid style event type list.
Kenichi Handa <handa@m17n.org>
parents:
89551
diff
changeset
|
1199 TO) specifying a range of characters. */ |
e2d5f38e23b4
(Fdefine_key): Fix handling of Lucid style event type list.
Kenichi Handa <handa@m17n.org>
parents:
89551
diff
changeset
|
1200 if (lucid_event_type_list_p (c)) |
e2d5f38e23b4
(Fdefine_key): Fix handling of Lucid style event type list.
Kenichi Handa <handa@m17n.org>
parents:
89551
diff
changeset
|
1201 c = Fevent_convert_list (c); |
e2d5f38e23b4
(Fdefine_key): Fix handling of Lucid style event type list.
Kenichi Handa <handa@m17n.org>
parents:
89551
diff
changeset
|
1202 else if (CHARACTERP (XCAR (c))) |
89483 | 1203 CHECK_CHARACTER_CDR (c); |
88380 | 1204 } |
10840
3a7336f191b9
(Fdefine_key): Handle Lucid-style (crtl backspace) etc.
Richard M. Stallman <rms@gnu.org>
parents:
10810
diff
changeset
|
1205 |
42404
ca040d0f5c67
(silly_event_symbol_error): New subrtn, from Fdefine_key.
Richard M. Stallman <rms@gnu.org>
parents:
42381
diff
changeset
|
1206 if (SYMBOLP (c)) |
ca040d0f5c67
(silly_event_symbol_error): New subrtn, from Fdefine_key.
Richard M. Stallman <rms@gnu.org>
parents:
42381
diff
changeset
|
1207 silly_event_symbol_error (c); |
42378
9f96219e833e
(Flookup_key): Add error message for trying to bind [DEL], [RET], etc.
Richard M. Stallman <rms@gnu.org>
parents:
42206
diff
changeset
|
1208 |
9123
c225137ddefb
(get_keyelt, store_in_keymap, Fcopy_keymap, Fdefine_key, Flookup_key,
Karl Heuer <kwzh@gnu.org>
parents:
8922
diff
changeset
|
1209 if (INTEGERP (c) |
2059 | 1210 && (XINT (c) & meta_bit) |
250 | 1211 && !metized) |
1212 { | |
1213 c = meta_prefix_char; | |
1214 metized = 1; | |
1215 } | |
1216 else | |
1217 { | |
9123
c225137ddefb
(get_keyelt, store_in_keymap, Fcopy_keymap, Fdefine_key, Flookup_key,
Karl Heuer <kwzh@gnu.org>
parents:
8922
diff
changeset
|
1218 if (INTEGERP (c)) |
2093
ce8bad247b1a
(Fdefine_key): Use proper meta-bit to clear.
Richard M. Stallman <rms@gnu.org>
parents:
2059
diff
changeset
|
1219 XSETINT (c, XINT (c) & ~meta_bit); |
250 | 1220 |
1221 metized = 0; | |
1222 idx++; | |
1223 } | |
1224 | |
88380 | 1225 if (!INTEGERP (c) && !SYMBOLP (c) |
1226 && (!CONSP (c) | |
1227 /* If C is a range, it must be a leaf. */ | |
1228 || (INTEGERP (XCAR (c)) && idx != length))) | |
42378
9f96219e833e
(Flookup_key): Add error message for trying to bind [DEL], [RET], etc.
Richard M. Stallman <rms@gnu.org>
parents:
42206
diff
changeset
|
1229 error ("Key sequence contains invalid event"); |
6473
76bb655df959
(Fdefine_key): Check for non-events in keyvector.
Karl Heuer <kwzh@gnu.org>
parents:
6457
diff
changeset
|
1230 |
250 | 1231 if (idx == length) |
1517
72b7bbcaf7d8
* keymap.c (Fdefine_key, Flookup_key, describe_map): Don't assume
Jim Blandy <jimb@redhat.com>
parents:
1441
diff
changeset
|
1232 RETURN_UNGCPRO (store_in_keymap (keymap, c, def)); |
250 | 1233 |
32476
9b2a0dc393a4
* keymap.c (access_keymap): Add AUTOLOAD parameter.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
32145
diff
changeset
|
1234 cmd = access_keymap (keymap, c, 0, 1, 1); |
250 | 1235 |
3735
7193a99a87c1
Make prefix keys work with keymap inheritance
Richard M. Stallman <rms@gnu.org>
parents:
3691
diff
changeset
|
1236 /* If this key is undefined, make it a prefix. */ |
485 | 1237 if (NILP (cmd)) |
3735
7193a99a87c1
Make prefix keys work with keymap inheritance
Richard M. Stallman <rms@gnu.org>
parents:
3691
diff
changeset
|
1238 cmd = define_as_prefix (keymap, c); |
250 | 1239 |
32988
c3435dc00ed7
* lisp.h (KEYMAPP): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
32889
diff
changeset
|
1240 keymap = get_keymap (cmd, 0, 1); |
c3435dc00ed7
* lisp.h (KEYMAPP): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
32889
diff
changeset
|
1241 if (!CONSP (keymap)) |
6502
18dfda644bc0
(access_keymap, store_in_keymap, Fcopy_keymap, Fdefine_key,
Karl Heuer <kwzh@gnu.org>
parents:
6475
diff
changeset
|
1242 /* We must use Fkey_description rather than just passing key to |
18dfda644bc0
(access_keymap, store_in_keymap, Fcopy_keymap, Fdefine_key,
Karl Heuer <kwzh@gnu.org>
parents:
6475
diff
changeset
|
1243 error; key might be a vector, not a string. */ |
70293
3f5619e77411
(Fdefine_key): Improve error message when KEY begins with a non-prefix key.
Richard M. Stallman <rms@gnu.org>
parents:
70242
diff
changeset
|
1244 error ("Key sequence %s starts with non-prefix key %s", |
3f5619e77411
(Fdefine_key): Improve error message when KEY begins with a non-prefix key.
Richard M. Stallman <rms@gnu.org>
parents:
70242
diff
changeset
|
1245 SDATA (Fkey_description (key, Qnil)), |
3f5619e77411
(Fdefine_key): Improve error message when KEY begins with a non-prefix key.
Richard M. Stallman <rms@gnu.org>
parents:
70242
diff
changeset
|
1246 SDATA (Fkey_description (Fsubstring (key, make_number (0), |
3f5619e77411
(Fdefine_key): Improve error message when KEY begins with a non-prefix key.
Richard M. Stallman <rms@gnu.org>
parents:
70242
diff
changeset
|
1247 make_number (idx)), |
3f5619e77411
(Fdefine_key): Improve error message when KEY begins with a non-prefix key.
Richard M. Stallman <rms@gnu.org>
parents:
70242
diff
changeset
|
1248 Qnil))); |
250 | 1249 } |
1250 } | |
1251 | |
43494
b5b76b498398
The following changes rework my patch of 2002-02-06 which
Kim F. Storm <storm@cua.dk>
parents:
43164
diff
changeset
|
1252 /* This function may GC (it calls Fkey_binding). */ |
b5b76b498398
The following changes rework my patch of 2002-02-06 which
Kim F. Storm <storm@cua.dk>
parents:
43164
diff
changeset
|
1253 |
76887
a5751af0b8a7
(Fcommand_remapping): New optional argument.
Chong Yidong <cyd@stupidchicken.com>
parents:
76862
diff
changeset
|
1254 DEFUN ("command-remapping", Fcommand_remapping, Scommand_remapping, 1, 3, 0, |
a5751af0b8a7
(Fcommand_remapping): New optional argument.
Chong Yidong <cyd@stupidchicken.com>
parents:
76862
diff
changeset
|
1255 doc: /* Return the remapping for command COMMAND. |
72889
25c755416160
* NEWS: explain new behavior and arguments of `key-binding' and
David Kastrup <dak@gnu.org>
parents:
72806
diff
changeset
|
1256 Returns nil if COMMAND is not remapped (or not a symbol). |
25c755416160
* NEWS: explain new behavior and arguments of `key-binding' and
David Kastrup <dak@gnu.org>
parents:
72806
diff
changeset
|
1257 |
25c755416160
* NEWS: explain new behavior and arguments of `key-binding' and
David Kastrup <dak@gnu.org>
parents:
72806
diff
changeset
|
1258 If the optional argument POSITION is non-nil, it specifies a mouse |
25c755416160
* NEWS: explain new behavior and arguments of `key-binding' and
David Kastrup <dak@gnu.org>
parents:
72806
diff
changeset
|
1259 position as returned by `event-start' and `event-end', and the |
25c755416160
* NEWS: explain new behavior and arguments of `key-binding' and
David Kastrup <dak@gnu.org>
parents:
72806
diff
changeset
|
1260 remapping occurs in the keymaps associated with it. It can also be a |
25c755416160
* NEWS: explain new behavior and arguments of `key-binding' and
David Kastrup <dak@gnu.org>
parents:
72806
diff
changeset
|
1261 number or marker, in which case the keymap properties at the specified |
76887
a5751af0b8a7
(Fcommand_remapping): New optional argument.
Chong Yidong <cyd@stupidchicken.com>
parents:
76862
diff
changeset
|
1262 buffer position instead of point are used. The KEYMAPS argument is |
a5751af0b8a7
(Fcommand_remapping): New optional argument.
Chong Yidong <cyd@stupidchicken.com>
parents:
76862
diff
changeset
|
1263 ignored if POSITION is non-nil. |
a5751af0b8a7
(Fcommand_remapping): New optional argument.
Chong Yidong <cyd@stupidchicken.com>
parents:
76862
diff
changeset
|
1264 |
a5751af0b8a7
(Fcommand_remapping): New optional argument.
Chong Yidong <cyd@stupidchicken.com>
parents:
76862
diff
changeset
|
1265 If the optional argument KEYMAPS is non-nil, it should be a list of |
a5751af0b8a7
(Fcommand_remapping): New optional argument.
Chong Yidong <cyd@stupidchicken.com>
parents:
76862
diff
changeset
|
1266 keymaps to search for command remapping. Otherwise, search for the |
a5751af0b8a7
(Fcommand_remapping): New optional argument.
Chong Yidong <cyd@stupidchicken.com>
parents:
76862
diff
changeset
|
1267 remapping in all currently active keymaps. */) |
109179
8cfee7d2955f
Convert DEFUNs to standard C.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
109165
diff
changeset
|
1268 (Lisp_Object command, Lisp_Object position, Lisp_Object keymaps) |
43494
b5b76b498398
The following changes rework my patch of 2002-02-06 which
Kim F. Storm <storm@cua.dk>
parents:
43164
diff
changeset
|
1269 { |
49720
e4fcec69ba69
(Fremap_command): Return nil if arg is not a symbol.
Kim F. Storm <storm@cua.dk>
parents:
49059
diff
changeset
|
1270 if (!SYMBOLP (command)) |
e4fcec69ba69
(Fremap_command): Return nil if arg is not a symbol.
Kim F. Storm <storm@cua.dk>
parents:
49059
diff
changeset
|
1271 return Qnil; |
e4fcec69ba69
(Fremap_command): Return nil if arg is not a symbol.
Kim F. Storm <storm@cua.dk>
parents:
49059
diff
changeset
|
1272 |
49757
9fe119b14379
Renamed remap-command to command-remapping. All uses changed.
Kim F. Storm <storm@cua.dk>
parents:
49720
diff
changeset
|
1273 ASET (command_remapping_vector, 1, command); |
76887
a5751af0b8a7
(Fcommand_remapping): New optional argument.
Chong Yidong <cyd@stupidchicken.com>
parents:
76862
diff
changeset
|
1274 |
a5751af0b8a7
(Fcommand_remapping): New optional argument.
Chong Yidong <cyd@stupidchicken.com>
parents:
76862
diff
changeset
|
1275 if (NILP (keymaps)) |
a5751af0b8a7
(Fcommand_remapping): New optional argument.
Chong Yidong <cyd@stupidchicken.com>
parents:
76862
diff
changeset
|
1276 return Fkey_binding (command_remapping_vector, Qnil, Qt, position); |
a5751af0b8a7
(Fcommand_remapping): New optional argument.
Chong Yidong <cyd@stupidchicken.com>
parents:
76862
diff
changeset
|
1277 else |
a5751af0b8a7
(Fcommand_remapping): New optional argument.
Chong Yidong <cyd@stupidchicken.com>
parents:
76862
diff
changeset
|
1278 { |
a5751af0b8a7
(Fcommand_remapping): New optional argument.
Chong Yidong <cyd@stupidchicken.com>
parents:
76862
diff
changeset
|
1279 Lisp_Object maps, binding; |
a5751af0b8a7
(Fcommand_remapping): New optional argument.
Chong Yidong <cyd@stupidchicken.com>
parents:
76862
diff
changeset
|
1280 |
85372
f7d19cfed7da
* xselect.c (x_own_selection, x_handle_selection_clear)
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
85106
diff
changeset
|
1281 for (maps = keymaps; CONSP (maps); maps = XCDR (maps)) |
76887
a5751af0b8a7
(Fcommand_remapping): New optional argument.
Chong Yidong <cyd@stupidchicken.com>
parents:
76862
diff
changeset
|
1282 { |
85372
f7d19cfed7da
* xselect.c (x_own_selection, x_handle_selection_clear)
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
85106
diff
changeset
|
1283 binding = Flookup_key (XCAR (maps), command_remapping_vector, Qnil); |
76887
a5751af0b8a7
(Fcommand_remapping): New optional argument.
Chong Yidong <cyd@stupidchicken.com>
parents:
76862
diff
changeset
|
1284 if (!NILP (binding) && !INTEGERP (binding)) |
a5751af0b8a7
(Fcommand_remapping): New optional argument.
Chong Yidong <cyd@stupidchicken.com>
parents:
76862
diff
changeset
|
1285 return binding; |
a5751af0b8a7
(Fcommand_remapping): New optional argument.
Chong Yidong <cyd@stupidchicken.com>
parents:
76862
diff
changeset
|
1286 } |
a5751af0b8a7
(Fcommand_remapping): New optional argument.
Chong Yidong <cyd@stupidchicken.com>
parents:
76862
diff
changeset
|
1287 return Qnil; |
a5751af0b8a7
(Fcommand_remapping): New optional argument.
Chong Yidong <cyd@stupidchicken.com>
parents:
76862
diff
changeset
|
1288 } |
43494
b5b76b498398
The following changes rework my patch of 2002-02-06 which
Kim F. Storm <storm@cua.dk>
parents:
43164
diff
changeset
|
1289 } |
b5b76b498398
The following changes rework my patch of 2002-02-06 which
Kim F. Storm <storm@cua.dk>
parents:
43164
diff
changeset
|
1290 |
42206 | 1291 /* Value is number if KEY is too long; nil if valid but has no definition. */ |
7998
d4b5f4dd9c51
(Flookup_key): Add gcpro.
Richard M. Stallman <rms@gnu.org>
parents:
7894
diff
changeset
|
1292 /* GC is possible in this function if it autoloads a keymap. */ |
250 | 1293 |
1871
00bee181f7ed
* keymap.c (Flookup_key, Fkey_binding, Flocal_key_binding,
Jim Blandy <jimb@redhat.com>
parents:
1821
diff
changeset
|
1294 DEFUN ("lookup-key", Flookup_key, Slookup_key, 2, 3, 0, |
41001
a17c8b15ef1b
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
40804
diff
changeset
|
1295 doc: /* In keymap KEYMAP, look up key sequence KEY. Return the definition. |
74574
3c809b430d91
(Flookup_key): Doc fix.
Juanma Barranquero <lekktu@gmail.com>
parents:
73350
diff
changeset
|
1296 A value of nil means undefined. See doc of `define-key' |
3c809b430d91
(Flookup_key): Doc fix.
Juanma Barranquero <lekktu@gmail.com>
parents:
73350
diff
changeset
|
1297 for kinds of definitions. |
41001
a17c8b15ef1b
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
40804
diff
changeset
|
1298 |
a17c8b15ef1b
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
40804
diff
changeset
|
1299 A number as value means KEY is "too long"; |
a17c8b15ef1b
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
40804
diff
changeset
|
1300 that is, characters or symbols in it except for the last one |
a17c8b15ef1b
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
40804
diff
changeset
|
1301 fail to be a valid sequence of prefix characters in KEYMAP. |
a17c8b15ef1b
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
40804
diff
changeset
|
1302 The number is how many characters at the front of KEY |
67505
51053176f6b7
(Fset_keymap_parent, store_in_keymap): Use CHECK_IMPURE.
Richard M. Stallman <rms@gnu.org>
parents:
67259
diff
changeset
|
1303 it takes to reach a non-prefix key. |
41001
a17c8b15ef1b
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
40804
diff
changeset
|
1304 |
a17c8b15ef1b
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
40804
diff
changeset
|
1305 Normally, `lookup-key' ignores bindings for t, which act as default |
a17c8b15ef1b
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
40804
diff
changeset
|
1306 bindings, used when nothing else in the keymap applies; this makes it |
a17c8b15ef1b
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
40804
diff
changeset
|
1307 usable as a general function for probing keymaps. However, if the |
a17c8b15ef1b
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
40804
diff
changeset
|
1308 third optional argument ACCEPT-DEFAULT is non-nil, `lookup-key' will |
a17c8b15ef1b
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
40804
diff
changeset
|
1309 recognize the default bindings, just as `read-key-sequence' does. */) |
109179
8cfee7d2955f
Convert DEFUNs to standard C.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
109165
diff
changeset
|
1310 (Lisp_Object keymap, Lisp_Object key, Lisp_Object accept_default) |
250 | 1311 { |
1312 register int idx; | |
1313 register Lisp_Object cmd; | |
1314 register Lisp_Object c; | |
1315 int length; | |
39689
0572449a62be
(Fkeymap_prompt, Fcurrent_active_maps): New funs.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
39682
diff
changeset
|
1316 int t_ok = !NILP (accept_default); |
45279
220c13a65624
(keymap_parent): New fun, extracted from Fkeymap_parent.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
45235
diff
changeset
|
1317 struct gcpro gcpro1, gcpro2; |
220c13a65624
(keymap_parent): New fun, extracted from Fkeymap_parent.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
45235
diff
changeset
|
1318 |
220c13a65624
(keymap_parent): New fun, extracted from Fkeymap_parent.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
45235
diff
changeset
|
1319 GCPRO2 (keymap, key); |
32988
c3435dc00ed7
* lisp.h (KEYMAPP): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
32889
diff
changeset
|
1320 keymap = get_keymap (keymap, 1, 1); |
250 | 1321 |
71836
838fd2b04ce0
(Fdefine_key, Flookup_key): Use CHECK_VECTOR_OR_STRING.
Kim F. Storm <storm@cua.dk>
parents:
70554
diff
changeset
|
1322 CHECK_VECTOR_OR_STRING (key); |
250 | 1323 |
1517
72b7bbcaf7d8
* keymap.c (Fdefine_key, Flookup_key, describe_map): Don't assume
Jim Blandy <jimb@redhat.com>
parents:
1441
diff
changeset
|
1324 length = XFASTINT (Flength (key)); |
250 | 1325 if (length == 0) |
45279
220c13a65624
(keymap_parent): New fun, extracted from Fkeymap_parent.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
45235
diff
changeset
|
1326 RETURN_UNGCPRO (keymap); |
7998
d4b5f4dd9c51
(Flookup_key): Add gcpro.
Richard M. Stallman <rms@gnu.org>
parents:
7894
diff
changeset
|
1327 |
250 | 1328 idx = 0; |
1329 while (1) | |
1330 { | |
32476
9b2a0dc393a4
* keymap.c (access_keymap): Add AUTOLOAD parameter.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
32145
diff
changeset
|
1331 c = Faref (key, make_number (idx++)); |
250 | 1332 |
10840
3a7336f191b9
(Fdefine_key): Handle Lucid-style (crtl backspace) etc.
Richard M. Stallman <rms@gnu.org>
parents:
10810
diff
changeset
|
1333 if (CONSP (c) && lucid_event_type_list_p (c)) |
12151
43b030e896eb
(Flookup_key, Fdefine_key): Use Fevent_convert_list.
Karl Heuer <kwzh@gnu.org>
parents:
11973
diff
changeset
|
1334 c = Fevent_convert_list (c); |
10840
3a7336f191b9
(Fdefine_key): Handle Lucid-style (crtl backspace) etc.
Richard M. Stallman <rms@gnu.org>
parents:
10810
diff
changeset
|
1335 |
32476
9b2a0dc393a4
* keymap.c (access_keymap): Add AUTOLOAD parameter.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
32145
diff
changeset
|
1336 /* Turn the 8th bit of string chars into a meta modifier. */ |
80871
c49e1e480880
(Flookup_key): Fix typo in last change.
Andreas Schwab <schwab@suse.de>
parents:
80869
diff
changeset
|
1337 if (STRINGP (key) && XINT (c) & 0x80 && !STRING_MULTIBYTE (key)) |
32476
9b2a0dc393a4
* keymap.c (access_keymap): Add AUTOLOAD parameter.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
32145
diff
changeset
|
1338 XSETINT (c, (XINT (c) | meta_modifier) & ~0x80); |
9b2a0dc393a4
* keymap.c (access_keymap): Add AUTOLOAD parameter.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
32145
diff
changeset
|
1339 |
43504
20832766c3e1
(Flookup_key): Fixed problem in 2001-12-28 patch:
Kim F. Storm <storm@cua.dk>
parents:
43494
diff
changeset
|
1340 /* Allow string since binding for `menu-bar-select-buffer' |
20832766c3e1
(Flookup_key): Fixed problem in 2001-12-28 patch:
Kim F. Storm <storm@cua.dk>
parents:
43494
diff
changeset
|
1341 includes the buffer name in the key sequence. */ |
20832766c3e1
(Flookup_key): Fixed problem in 2001-12-28 patch:
Kim F. Storm <storm@cua.dk>
parents:
43494
diff
changeset
|
1342 if (!INTEGERP (c) && !SYMBOLP (c) && !CONSP (c) && !STRINGP (c)) |
42378
9f96219e833e
(Flookup_key): Add error message for trying to bind [DEL], [RET], etc.
Richard M. Stallman <rms@gnu.org>
parents:
42206
diff
changeset
|
1343 error ("Key sequence contains invalid event"); |
9f96219e833e
(Flookup_key): Add error message for trying to bind [DEL], [RET], etc.
Richard M. Stallman <rms@gnu.org>
parents:
42206
diff
changeset
|
1344 |
32476
9b2a0dc393a4
* keymap.c (access_keymap): Add AUTOLOAD parameter.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
32145
diff
changeset
|
1345 cmd = access_keymap (keymap, c, t_ok, 0, 1); |
250 | 1346 if (idx == length) |
7998
d4b5f4dd9c51
(Flookup_key): Add gcpro.
Richard M. Stallman <rms@gnu.org>
parents:
7894
diff
changeset
|
1347 RETURN_UNGCPRO (cmd); |
250 | 1348 |
32988
c3435dc00ed7
* lisp.h (KEYMAPP): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
32889
diff
changeset
|
1349 keymap = get_keymap (cmd, 0, 1); |
c3435dc00ed7
* lisp.h (KEYMAPP): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
32889
diff
changeset
|
1350 if (!CONSP (keymap)) |
7998
d4b5f4dd9c51
(Flookup_key): Add gcpro.
Richard M. Stallman <rms@gnu.org>
parents:
7894
diff
changeset
|
1351 RETURN_UNGCPRO (make_number (idx)); |
250 | 1352 |
1353 QUIT; | |
1354 } | |
1355 } | |
1356 | |
3735
7193a99a87c1
Make prefix keys work with keymap inheritance
Richard M. Stallman <rms@gnu.org>
parents:
3691
diff
changeset
|
1357 /* Make KEYMAP define event C as a keymap (i.e., as a prefix). |
7193a99a87c1
Make prefix keys work with keymap inheritance
Richard M. Stallman <rms@gnu.org>
parents:
3691
diff
changeset
|
1358 Assume that currently it does not define C at all. |
7193a99a87c1
Make prefix keys work with keymap inheritance
Richard M. Stallman <rms@gnu.org>
parents:
3691
diff
changeset
|
1359 Return the keymap. */ |
7193a99a87c1
Make prefix keys work with keymap inheritance
Richard M. Stallman <rms@gnu.org>
parents:
3691
diff
changeset
|
1360 |
7193a99a87c1
Make prefix keys work with keymap inheritance
Richard M. Stallman <rms@gnu.org>
parents:
3691
diff
changeset
|
1361 static Lisp_Object |
109126
aec1143e8d85
Convert (most) functions in src to standard C.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
109100
diff
changeset
|
1362 define_as_prefix (Lisp_Object keymap, Lisp_Object c) |
3735
7193a99a87c1
Make prefix keys work with keymap inheritance
Richard M. Stallman <rms@gnu.org>
parents:
3691
diff
changeset
|
1363 { |
32476
9b2a0dc393a4
* keymap.c (access_keymap): Add AUTOLOAD parameter.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
32145
diff
changeset
|
1364 Lisp_Object cmd; |
3735
7193a99a87c1
Make prefix keys work with keymap inheritance
Richard M. Stallman <rms@gnu.org>
parents:
3691
diff
changeset
|
1365 |
7193a99a87c1
Make prefix keys work with keymap inheritance
Richard M. Stallman <rms@gnu.org>
parents:
3691
diff
changeset
|
1366 cmd = Fmake_sparse_keymap (Qnil); |
7193a99a87c1
Make prefix keys work with keymap inheritance
Richard M. Stallman <rms@gnu.org>
parents:
3691
diff
changeset
|
1367 /* If this key is defined as a prefix in an inherited keymap, |
7193a99a87c1
Make prefix keys work with keymap inheritance
Richard M. Stallman <rms@gnu.org>
parents:
3691
diff
changeset
|
1368 make it a prefix in this map, and make its definition |
7193a99a87c1
Make prefix keys work with keymap inheritance
Richard M. Stallman <rms@gnu.org>
parents:
3691
diff
changeset
|
1369 inherit the other prefix definition. */ |
32476
9b2a0dc393a4
* keymap.c (access_keymap): Add AUTOLOAD parameter.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
32145
diff
changeset
|
1370 cmd = nconc2 (cmd, access_keymap (keymap, c, 0, 0, 0)); |
3735
7193a99a87c1
Make prefix keys work with keymap inheritance
Richard M. Stallman <rms@gnu.org>
parents:
3691
diff
changeset
|
1371 store_in_keymap (keymap, c, cmd); |
7193a99a87c1
Make prefix keys work with keymap inheritance
Richard M. Stallman <rms@gnu.org>
parents:
3691
diff
changeset
|
1372 |
7193a99a87c1
Make prefix keys work with keymap inheritance
Richard M. Stallman <rms@gnu.org>
parents:
3691
diff
changeset
|
1373 return cmd; |
7193a99a87c1
Make prefix keys work with keymap inheritance
Richard M. Stallman <rms@gnu.org>
parents:
3691
diff
changeset
|
1374 } |
7193a99a87c1
Make prefix keys work with keymap inheritance
Richard M. Stallman <rms@gnu.org>
parents:
3691
diff
changeset
|
1375 |
2093
ce8bad247b1a
(Fdefine_key): Use proper meta-bit to clear.
Richard M. Stallman <rms@gnu.org>
parents:
2059
diff
changeset
|
1376 /* Append a key to the end of a key sequence. We always make a vector. */ |
ce8bad247b1a
(Fdefine_key): Use proper meta-bit to clear.
Richard M. Stallman <rms@gnu.org>
parents:
2059
diff
changeset
|
1377 |
250 | 1378 Lisp_Object |
109126
aec1143e8d85
Convert (most) functions in src to standard C.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
109100
diff
changeset
|
1379 append_key (Lisp_Object key_sequence, Lisp_Object key) |
250 | 1380 { |
1381 Lisp_Object args[2]; | |
1382 | |
1383 args[0] = key_sequence; | |
1384 | |
2093
ce8bad247b1a
(Fdefine_key): Use proper meta-bit to clear.
Richard M. Stallman <rms@gnu.org>
parents:
2059
diff
changeset
|
1385 args[1] = Fcons (key, Qnil); |
ce8bad247b1a
(Fdefine_key): Use proper meta-bit to clear.
Richard M. Stallman <rms@gnu.org>
parents:
2059
diff
changeset
|
1386 return Fvconcat (2, args); |
250 | 1387 } |
1388 | |
42404
ca040d0f5c67
(silly_event_symbol_error): New subrtn, from Fdefine_key.
Richard M. Stallman <rms@gnu.org>
parents:
42381
diff
changeset
|
1389 /* Given a event type C which is a symbol, |
ca040d0f5c67
(silly_event_symbol_error): New subrtn, from Fdefine_key.
Richard M. Stallman <rms@gnu.org>
parents:
42381
diff
changeset
|
1390 signal an error if is a mistake such as RET or M-RET or C-DEL, etc. */ |
ca040d0f5c67
(silly_event_symbol_error): New subrtn, from Fdefine_key.
Richard M. Stallman <rms@gnu.org>
parents:
42381
diff
changeset
|
1391 |
ca040d0f5c67
(silly_event_symbol_error): New subrtn, from Fdefine_key.
Richard M. Stallman <rms@gnu.org>
parents:
42381
diff
changeset
|
1392 static void |
109126
aec1143e8d85
Convert (most) functions in src to standard C.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
109100
diff
changeset
|
1393 silly_event_symbol_error (Lisp_Object c) |
42404
ca040d0f5c67
(silly_event_symbol_error): New subrtn, from Fdefine_key.
Richard M. Stallman <rms@gnu.org>
parents:
42381
diff
changeset
|
1394 { |
ca040d0f5c67
(silly_event_symbol_error): New subrtn, from Fdefine_key.
Richard M. Stallman <rms@gnu.org>
parents:
42381
diff
changeset
|
1395 Lisp_Object parsed, base, name, assoc; |
ca040d0f5c67
(silly_event_symbol_error): New subrtn, from Fdefine_key.
Richard M. Stallman <rms@gnu.org>
parents:
42381
diff
changeset
|
1396 int modifiers; |
45619
dbd65bd8bb4f
(describe_command): Cast `current_column' return value to int.
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
45404
diff
changeset
|
1397 |
42404
ca040d0f5c67
(silly_event_symbol_error): New subrtn, from Fdefine_key.
Richard M. Stallman <rms@gnu.org>
parents:
42381
diff
changeset
|
1398 parsed = parse_modifiers (c); |
ca040d0f5c67
(silly_event_symbol_error): New subrtn, from Fdefine_key.
Richard M. Stallman <rms@gnu.org>
parents:
42381
diff
changeset
|
1399 modifiers = (int) XUINT (XCAR (XCDR (parsed))); |
ca040d0f5c67
(silly_event_symbol_error): New subrtn, from Fdefine_key.
Richard M. Stallman <rms@gnu.org>
parents:
42381
diff
changeset
|
1400 base = XCAR (parsed); |
ca040d0f5c67
(silly_event_symbol_error): New subrtn, from Fdefine_key.
Richard M. Stallman <rms@gnu.org>
parents:
42381
diff
changeset
|
1401 name = Fsymbol_name (base); |
ca040d0f5c67
(silly_event_symbol_error): New subrtn, from Fdefine_key.
Richard M. Stallman <rms@gnu.org>
parents:
42381
diff
changeset
|
1402 /* This alist includes elements such as ("RET" . "\\r"). */ |
ca040d0f5c67
(silly_event_symbol_error): New subrtn, from Fdefine_key.
Richard M. Stallman <rms@gnu.org>
parents:
42381
diff
changeset
|
1403 assoc = Fassoc (name, exclude_keys); |
ca040d0f5c67
(silly_event_symbol_error): New subrtn, from Fdefine_key.
Richard M. Stallman <rms@gnu.org>
parents:
42381
diff
changeset
|
1404 |
ca040d0f5c67
(silly_event_symbol_error): New subrtn, from Fdefine_key.
Richard M. Stallman <rms@gnu.org>
parents:
42381
diff
changeset
|
1405 if (! NILP (assoc)) |
ca040d0f5c67
(silly_event_symbol_error): New subrtn, from Fdefine_key.
Richard M. Stallman <rms@gnu.org>
parents:
42381
diff
changeset
|
1406 { |
ca040d0f5c67
(silly_event_symbol_error): New subrtn, from Fdefine_key.
Richard M. Stallman <rms@gnu.org>
parents:
42381
diff
changeset
|
1407 char new_mods[sizeof ("\\A-\\C-\\H-\\M-\\S-\\s-")]; |
ca040d0f5c67
(silly_event_symbol_error): New subrtn, from Fdefine_key.
Richard M. Stallman <rms@gnu.org>
parents:
42381
diff
changeset
|
1408 char *p = new_mods; |
ca040d0f5c67
(silly_event_symbol_error): New subrtn, from Fdefine_key.
Richard M. Stallman <rms@gnu.org>
parents:
42381
diff
changeset
|
1409 Lisp_Object keystring; |
ca040d0f5c67
(silly_event_symbol_error): New subrtn, from Fdefine_key.
Richard M. Stallman <rms@gnu.org>
parents:
42381
diff
changeset
|
1410 if (modifiers & alt_modifier) |
ca040d0f5c67
(silly_event_symbol_error): New subrtn, from Fdefine_key.
Richard M. Stallman <rms@gnu.org>
parents:
42381
diff
changeset
|
1411 { *p++ = '\\'; *p++ = 'A'; *p++ = '-'; } |
ca040d0f5c67
(silly_event_symbol_error): New subrtn, from Fdefine_key.
Richard M. Stallman <rms@gnu.org>
parents:
42381
diff
changeset
|
1412 if (modifiers & ctrl_modifier) |
ca040d0f5c67
(silly_event_symbol_error): New subrtn, from Fdefine_key.
Richard M. Stallman <rms@gnu.org>
parents:
42381
diff
changeset
|
1413 { *p++ = '\\'; *p++ = 'C'; *p++ = '-'; } |
ca040d0f5c67
(silly_event_symbol_error): New subrtn, from Fdefine_key.
Richard M. Stallman <rms@gnu.org>
parents:
42381
diff
changeset
|
1414 if (modifiers & hyper_modifier) |
ca040d0f5c67
(silly_event_symbol_error): New subrtn, from Fdefine_key.
Richard M. Stallman <rms@gnu.org>
parents:
42381
diff
changeset
|
1415 { *p++ = '\\'; *p++ = 'H'; *p++ = '-'; } |
ca040d0f5c67
(silly_event_symbol_error): New subrtn, from Fdefine_key.
Richard M. Stallman <rms@gnu.org>
parents:
42381
diff
changeset
|
1416 if (modifiers & meta_modifier) |
ca040d0f5c67
(silly_event_symbol_error): New subrtn, from Fdefine_key.
Richard M. Stallman <rms@gnu.org>
parents:
42381
diff
changeset
|
1417 { *p++ = '\\'; *p++ = 'M'; *p++ = '-'; } |
ca040d0f5c67
(silly_event_symbol_error): New subrtn, from Fdefine_key.
Richard M. Stallman <rms@gnu.org>
parents:
42381
diff
changeset
|
1418 if (modifiers & shift_modifier) |
ca040d0f5c67
(silly_event_symbol_error): New subrtn, from Fdefine_key.
Richard M. Stallman <rms@gnu.org>
parents:
42381
diff
changeset
|
1419 { *p++ = '\\'; *p++ = 'S'; *p++ = '-'; } |
ca040d0f5c67
(silly_event_symbol_error): New subrtn, from Fdefine_key.
Richard M. Stallman <rms@gnu.org>
parents:
42381
diff
changeset
|
1420 if (modifiers & super_modifier) |
ca040d0f5c67
(silly_event_symbol_error): New subrtn, from Fdefine_key.
Richard M. Stallman <rms@gnu.org>
parents:
42381
diff
changeset
|
1421 { *p++ = '\\'; *p++ = 's'; *p++ = '-'; } |
ca040d0f5c67
(silly_event_symbol_error): New subrtn, from Fdefine_key.
Richard M. Stallman <rms@gnu.org>
parents:
42381
diff
changeset
|
1422 *p = 0; |
ca040d0f5c67
(silly_event_symbol_error): New subrtn, from Fdefine_key.
Richard M. Stallman <rms@gnu.org>
parents:
42381
diff
changeset
|
1423 |
ca040d0f5c67
(silly_event_symbol_error): New subrtn, from Fdefine_key.
Richard M. Stallman <rms@gnu.org>
parents:
42381
diff
changeset
|
1424 c = reorder_modifiers (c); |
ca040d0f5c67
(silly_event_symbol_error): New subrtn, from Fdefine_key.
Richard M. Stallman <rms@gnu.org>
parents:
42381
diff
changeset
|
1425 keystring = concat2 (build_string (new_mods), XCDR (assoc)); |
45619
dbd65bd8bb4f
(describe_command): Cast `current_column' return value to int.
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
45404
diff
changeset
|
1426 |
42404
ca040d0f5c67
(silly_event_symbol_error): New subrtn, from Fdefine_key.
Richard M. Stallman <rms@gnu.org>
parents:
42381
diff
changeset
|
1427 error ((modifiers & ~meta_modifier |
ca040d0f5c67
(silly_event_symbol_error): New subrtn, from Fdefine_key.
Richard M. Stallman <rms@gnu.org>
parents:
42381
diff
changeset
|
1428 ? "To bind the key %s, use [?%s], not [%s]" |
ca040d0f5c67
(silly_event_symbol_error): New subrtn, from Fdefine_key.
Richard M. Stallman <rms@gnu.org>
parents:
42381
diff
changeset
|
1429 : "To bind the key %s, use \"%s\", not [%s]"), |
46370
40db0673e6f0
Most uses of XSTRING combined with STRING_BYTES or indirection changed to
Ken Raeburn <raeburn@raeburn.org>
parents:
46310
diff
changeset
|
1430 SDATA (SYMBOL_NAME (c)), SDATA (keystring), |
40db0673e6f0
Most uses of XSTRING combined with STRING_BYTES or indirection changed to
Ken Raeburn <raeburn@raeburn.org>
parents:
46310
diff
changeset
|
1431 SDATA (SYMBOL_NAME (c))); |
42404
ca040d0f5c67
(silly_event_symbol_error): New subrtn, from Fdefine_key.
Richard M. Stallman <rms@gnu.org>
parents:
42381
diff
changeset
|
1432 } |
ca040d0f5c67
(silly_event_symbol_error): New subrtn, from Fdefine_key.
Richard M. Stallman <rms@gnu.org>
parents:
42381
diff
changeset
|
1433 } |
250 | 1434 |
465 | 1435 /* Global, local, and minor mode keymap stuff. */ |
1436 | |
485 | 1437 /* We can't put these variables inside current_minor_maps, since under |
517 | 1438 some systems, static gets macro-defined to be the empty string. |
1439 Ickypoo. */ | |
45235
66271fa0bf60
(current_minor_maps): Fixed resizing of cmm_maps;
Kim F. Storm <storm@cua.dk>
parents:
45222
diff
changeset
|
1440 static Lisp_Object *cmm_modes = NULL, *cmm_maps = NULL; |
66271fa0bf60
(current_minor_maps): Fixed resizing of cmm_maps;
Kim F. Storm <storm@cua.dk>
parents:
45222
diff
changeset
|
1441 static int cmm_size = 0; |
485 | 1442 |
76710
13738aa5cbd1
Fix a comment before `current_minor_maps'.
Eli Zaretskii <eliz@gnu.org>
parents:
76415
diff
changeset
|
1443 /* Store a pointer to an array of the currently active minor modes in |
13738aa5cbd1
Fix a comment before `current_minor_maps'.
Eli Zaretskii <eliz@gnu.org>
parents:
76415
diff
changeset
|
1444 *modeptr, a pointer to an array of the keymaps of the currently |
13738aa5cbd1
Fix a comment before `current_minor_maps'.
Eli Zaretskii <eliz@gnu.org>
parents:
76415
diff
changeset
|
1445 active minor modes in *mapptr, and return the number of maps |
13738aa5cbd1
Fix a comment before `current_minor_maps'.
Eli Zaretskii <eliz@gnu.org>
parents:
76415
diff
changeset
|
1446 *mapptr contains. |
465 | 1447 |
1448 This function always returns a pointer to the same buffer, and may | |
1449 free or reallocate it, so if you want to keep it for a long time or | |
1450 hand it out to lisp code, copy it. This procedure will be called | |
1451 for every key sequence read, so the nice lispy approach (return a | |
1452 new assoclist, list, what have you) for each invocation would | |
1453 result in a lot of consing over time. | |
1454 | |
1455 If we used xrealloc/xmalloc and ran out of memory, they would throw | |
1456 back to the command loop, which would try to read a key sequence, | |
1457 which would call this function again, resulting in an infinite | |
1458 loop. Instead, we'll use realloc/malloc and silently truncate the | |
1459 list, let the key sequence be read, and hope some other piece of | |
1460 code signals the error. */ | |
1461 int | |
109126
aec1143e8d85
Convert (most) functions in src to standard C.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
109100
diff
changeset
|
1462 current_minor_maps (Lisp_Object **modeptr, Lisp_Object **mapptr) |
465 | 1463 { |
1464 int i = 0; | |
20517
40bfe766d355
(Vminor_mode_overriding_map_alist): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
20381
diff
changeset
|
1465 int list_number = 0; |
517 | 1466 Lisp_Object alist, assoc, var, val; |
45222
c525c7445e1b
(Vemulation_mode_map_alists): New variable.
Kim F. Storm <storm@cua.dk>
parents:
43504
diff
changeset
|
1467 Lisp_Object emulation_alists; |
20517
40bfe766d355
(Vminor_mode_overriding_map_alist): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
20381
diff
changeset
|
1468 Lisp_Object lists[2]; |
40bfe766d355
(Vminor_mode_overriding_map_alist): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
20381
diff
changeset
|
1469 |
45222
c525c7445e1b
(Vemulation_mode_map_alists): New variable.
Kim F. Storm <storm@cua.dk>
parents:
43504
diff
changeset
|
1470 emulation_alists = Vemulation_mode_map_alists; |
20517
40bfe766d355
(Vminor_mode_overriding_map_alist): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
20381
diff
changeset
|
1471 lists[0] = Vminor_mode_overriding_map_alist; |
40bfe766d355
(Vminor_mode_overriding_map_alist): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
20381
diff
changeset
|
1472 lists[1] = Vminor_mode_map_alist; |
40bfe766d355
(Vminor_mode_overriding_map_alist): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
20381
diff
changeset
|
1473 |
40bfe766d355
(Vminor_mode_overriding_map_alist): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
20381
diff
changeset
|
1474 for (list_number = 0; list_number < 2; list_number++) |
45222
c525c7445e1b
(Vemulation_mode_map_alists): New variable.
Kim F. Storm <storm@cua.dk>
parents:
43504
diff
changeset
|
1475 { |
c525c7445e1b
(Vemulation_mode_map_alists): New variable.
Kim F. Storm <storm@cua.dk>
parents:
43504
diff
changeset
|
1476 if (CONSP (emulation_alists)) |
20517
40bfe766d355
(Vminor_mode_overriding_map_alist): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
20381
diff
changeset
|
1477 { |
45222
c525c7445e1b
(Vemulation_mode_map_alists): New variable.
Kim F. Storm <storm@cua.dk>
parents:
43504
diff
changeset
|
1478 alist = XCAR (emulation_alists); |
c525c7445e1b
(Vemulation_mode_map_alists): New variable.
Kim F. Storm <storm@cua.dk>
parents:
43504
diff
changeset
|
1479 emulation_alists = XCDR (emulation_alists); |
c525c7445e1b
(Vemulation_mode_map_alists): New variable.
Kim F. Storm <storm@cua.dk>
parents:
43504
diff
changeset
|
1480 if (SYMBOLP (alist)) |
c525c7445e1b
(Vemulation_mode_map_alists): New variable.
Kim F. Storm <storm@cua.dk>
parents:
43504
diff
changeset
|
1481 alist = find_symbol_value (alist); |
c525c7445e1b
(Vemulation_mode_map_alists): New variable.
Kim F. Storm <storm@cua.dk>
parents:
43504
diff
changeset
|
1482 list_number = -1; |
c525c7445e1b
(Vemulation_mode_map_alists): New variable.
Kim F. Storm <storm@cua.dk>
parents:
43504
diff
changeset
|
1483 } |
c525c7445e1b
(Vemulation_mode_map_alists): New variable.
Kim F. Storm <storm@cua.dk>
parents:
43504
diff
changeset
|
1484 else |
c525c7445e1b
(Vemulation_mode_map_alists): New variable.
Kim F. Storm <storm@cua.dk>
parents:
43504
diff
changeset
|
1485 alist = lists[list_number]; |
c525c7445e1b
(Vemulation_mode_map_alists): New variable.
Kim F. Storm <storm@cua.dk>
parents:
43504
diff
changeset
|
1486 |
c525c7445e1b
(Vemulation_mode_map_alists): New variable.
Kim F. Storm <storm@cua.dk>
parents:
43504
diff
changeset
|
1487 for ( ; CONSP (alist); alist = XCDR (alist)) |
c525c7445e1b
(Vemulation_mode_map_alists): New variable.
Kim F. Storm <storm@cua.dk>
parents:
43504
diff
changeset
|
1488 if ((assoc = XCAR (alist), CONSP (assoc)) |
c525c7445e1b
(Vemulation_mode_map_alists): New variable.
Kim F. Storm <storm@cua.dk>
parents:
43504
diff
changeset
|
1489 && (var = XCAR (assoc), SYMBOLP (var)) |
c525c7445e1b
(Vemulation_mode_map_alists): New variable.
Kim F. Storm <storm@cua.dk>
parents:
43504
diff
changeset
|
1490 && (val = find_symbol_value (var), !EQ (val, Qunbound)) |
c525c7445e1b
(Vemulation_mode_map_alists): New variable.
Kim F. Storm <storm@cua.dk>
parents:
43504
diff
changeset
|
1491 && !NILP (val)) |
c525c7445e1b
(Vemulation_mode_map_alists): New variable.
Kim F. Storm <storm@cua.dk>
parents:
43504
diff
changeset
|
1492 { |
c525c7445e1b
(Vemulation_mode_map_alists): New variable.
Kim F. Storm <storm@cua.dk>
parents:
43504
diff
changeset
|
1493 Lisp_Object temp; |
c525c7445e1b
(Vemulation_mode_map_alists): New variable.
Kim F. Storm <storm@cua.dk>
parents:
43504
diff
changeset
|
1494 |
c525c7445e1b
(Vemulation_mode_map_alists): New variable.
Kim F. Storm <storm@cua.dk>
parents:
43504
diff
changeset
|
1495 /* If a variable has an entry in Vminor_mode_overriding_map_alist, |
c525c7445e1b
(Vemulation_mode_map_alists): New variable.
Kim F. Storm <storm@cua.dk>
parents:
43504
diff
changeset
|
1496 and also an entry in Vminor_mode_map_alist, |
c525c7445e1b
(Vemulation_mode_map_alists): New variable.
Kim F. Storm <storm@cua.dk>
parents:
43504
diff
changeset
|
1497 ignore the latter. */ |
c525c7445e1b
(Vemulation_mode_map_alists): New variable.
Kim F. Storm <storm@cua.dk>
parents:
43504
diff
changeset
|
1498 if (list_number == 1) |
c525c7445e1b
(Vemulation_mode_map_alists): New variable.
Kim F. Storm <storm@cua.dk>
parents:
43504
diff
changeset
|
1499 { |
c525c7445e1b
(Vemulation_mode_map_alists): New variable.
Kim F. Storm <storm@cua.dk>
parents:
43504
diff
changeset
|
1500 val = assq_no_quit (var, lists[0]); |
c525c7445e1b
(Vemulation_mode_map_alists): New variable.
Kim F. Storm <storm@cua.dk>
parents:
43504
diff
changeset
|
1501 if (!NILP (val)) |
c525c7445e1b
(Vemulation_mode_map_alists): New variable.
Kim F. Storm <storm@cua.dk>
parents:
43504
diff
changeset
|
1502 continue; |
c525c7445e1b
(Vemulation_mode_map_alists): New variable.
Kim F. Storm <storm@cua.dk>
parents:
43504
diff
changeset
|
1503 } |
c525c7445e1b
(Vemulation_mode_map_alists): New variable.
Kim F. Storm <storm@cua.dk>
parents:
43504
diff
changeset
|
1504 |
c525c7445e1b
(Vemulation_mode_map_alists): New variable.
Kim F. Storm <storm@cua.dk>
parents:
43504
diff
changeset
|
1505 if (i >= cmm_size) |
c525c7445e1b
(Vemulation_mode_map_alists): New variable.
Kim F. Storm <storm@cua.dk>
parents:
43504
diff
changeset
|
1506 { |
45235
66271fa0bf60
(current_minor_maps): Fixed resizing of cmm_maps;
Kim F. Storm <storm@cua.dk>
parents:
45222
diff
changeset
|
1507 int newsize, allocsize; |
45222
c525c7445e1b
(Vemulation_mode_map_alists): New variable.
Kim F. Storm <storm@cua.dk>
parents:
43504
diff
changeset
|
1508 Lisp_Object *newmodes, *newmaps; |
c525c7445e1b
(Vemulation_mode_map_alists): New variable.
Kim F. Storm <storm@cua.dk>
parents:
43504
diff
changeset
|
1509 |
45235
66271fa0bf60
(current_minor_maps): Fixed resizing of cmm_maps;
Kim F. Storm <storm@cua.dk>
parents:
45222
diff
changeset
|
1510 newsize = cmm_size == 0 ? 30 : cmm_size * 2; |
66271fa0bf60
(current_minor_maps): Fixed resizing of cmm_maps;
Kim F. Storm <storm@cua.dk>
parents:
45222
diff
changeset
|
1511 allocsize = newsize * sizeof *newmodes; |
66271fa0bf60
(current_minor_maps): Fixed resizing of cmm_maps;
Kim F. Storm <storm@cua.dk>
parents:
45222
diff
changeset
|
1512 |
45619
dbd65bd8bb4f
(describe_command): Cast `current_column' return value to int.
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
45404
diff
changeset
|
1513 /* Use malloc here. See the comment above this function. |
45235
66271fa0bf60
(current_minor_maps): Fixed resizing of cmm_maps;
Kim F. Storm <storm@cua.dk>
parents:
45222
diff
changeset
|
1514 Avoid realloc here; it causes spurious traps on GNU/Linux [KFS] */ |
66271fa0bf60
(current_minor_maps): Fixed resizing of cmm_maps;
Kim F. Storm <storm@cua.dk>
parents:
45222
diff
changeset
|
1515 BLOCK_INPUT; |
66271fa0bf60
(current_minor_maps): Fixed resizing of cmm_maps;
Kim F. Storm <storm@cua.dk>
parents:
45222
diff
changeset
|
1516 newmodes = (Lisp_Object *) malloc (allocsize); |
66271fa0bf60
(current_minor_maps): Fixed resizing of cmm_maps;
Kim F. Storm <storm@cua.dk>
parents:
45222
diff
changeset
|
1517 if (newmodes) |
45222
c525c7445e1b
(Vemulation_mode_map_alists): New variable.
Kim F. Storm <storm@cua.dk>
parents:
43504
diff
changeset
|
1518 { |
45235
66271fa0bf60
(current_minor_maps): Fixed resizing of cmm_maps;
Kim F. Storm <storm@cua.dk>
parents:
45222
diff
changeset
|
1519 if (cmm_modes) |
66271fa0bf60
(current_minor_maps): Fixed resizing of cmm_maps;
Kim F. Storm <storm@cua.dk>
parents:
45222
diff
changeset
|
1520 { |
109165
750db9f3e6d8
Replace bcopy, bzero, bcmp by memcpy, memmove, memset, memcmp
Andreas Schwab <schwab@linux-m68k.org>
parents:
109131
diff
changeset
|
1521 memcpy (newmodes, cmm_modes, |
750db9f3e6d8
Replace bcopy, bzero, bcmp by memcpy, memmove, memset, memcmp
Andreas Schwab <schwab@linux-m68k.org>
parents:
109131
diff
changeset
|
1522 cmm_size * sizeof cmm_modes[0]); |
45235
66271fa0bf60
(current_minor_maps): Fixed resizing of cmm_maps;
Kim F. Storm <storm@cua.dk>
parents:
45222
diff
changeset
|
1523 free (cmm_modes); |
66271fa0bf60
(current_minor_maps): Fixed resizing of cmm_maps;
Kim F. Storm <storm@cua.dk>
parents:
45222
diff
changeset
|
1524 } |
66271fa0bf60
(current_minor_maps): Fixed resizing of cmm_maps;
Kim F. Storm <storm@cua.dk>
parents:
45222
diff
changeset
|
1525 cmm_modes = newmodes; |
45222
c525c7445e1b
(Vemulation_mode_map_alists): New variable.
Kim F. Storm <storm@cua.dk>
parents:
43504
diff
changeset
|
1526 } |
45235
66271fa0bf60
(current_minor_maps): Fixed resizing of cmm_maps;
Kim F. Storm <storm@cua.dk>
parents:
45222
diff
changeset
|
1527 |
66271fa0bf60
(current_minor_maps): Fixed resizing of cmm_maps;
Kim F. Storm <storm@cua.dk>
parents:
45222
diff
changeset
|
1528 newmaps = (Lisp_Object *) malloc (allocsize); |
66271fa0bf60
(current_minor_maps): Fixed resizing of cmm_maps;
Kim F. Storm <storm@cua.dk>
parents:
45222
diff
changeset
|
1529 if (newmaps) |
45222
c525c7445e1b
(Vemulation_mode_map_alists): New variable.
Kim F. Storm <storm@cua.dk>
parents:
43504
diff
changeset
|
1530 { |
45235
66271fa0bf60
(current_minor_maps): Fixed resizing of cmm_maps;
Kim F. Storm <storm@cua.dk>
parents:
45222
diff
changeset
|
1531 if (cmm_maps) |
66271fa0bf60
(current_minor_maps): Fixed resizing of cmm_maps;
Kim F. Storm <storm@cua.dk>
parents:
45222
diff
changeset
|
1532 { |
109165
750db9f3e6d8
Replace bcopy, bzero, bcmp by memcpy, memmove, memset, memcmp
Andreas Schwab <schwab@linux-m68k.org>
parents:
109131
diff
changeset
|
1533 memcpy (newmaps, cmm_maps, |
750db9f3e6d8
Replace bcopy, bzero, bcmp by memcpy, memmove, memset, memcmp
Andreas Schwab <schwab@linux-m68k.org>
parents:
109131
diff
changeset
|
1534 cmm_size * sizeof cmm_maps[0]); |
45235
66271fa0bf60
(current_minor_maps): Fixed resizing of cmm_maps;
Kim F. Storm <storm@cua.dk>
parents:
45222
diff
changeset
|
1535 free (cmm_maps); |
66271fa0bf60
(current_minor_maps): Fixed resizing of cmm_maps;
Kim F. Storm <storm@cua.dk>
parents:
45222
diff
changeset
|
1536 } |
66271fa0bf60
(current_minor_maps): Fixed resizing of cmm_maps;
Kim F. Storm <storm@cua.dk>
parents:
45222
diff
changeset
|
1537 cmm_maps = newmaps; |
45222
c525c7445e1b
(Vemulation_mode_map_alists): New variable.
Kim F. Storm <storm@cua.dk>
parents:
43504
diff
changeset
|
1538 } |
45235
66271fa0bf60
(current_minor_maps): Fixed resizing of cmm_maps;
Kim F. Storm <storm@cua.dk>
parents:
45222
diff
changeset
|
1539 UNBLOCK_INPUT; |
45619
dbd65bd8bb4f
(describe_command): Cast `current_column' return value to int.
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
45404
diff
changeset
|
1540 |
45222
c525c7445e1b
(Vemulation_mode_map_alists): New variable.
Kim F. Storm <storm@cua.dk>
parents:
43504
diff
changeset
|
1541 if (newmodes == NULL || newmaps == NULL) |
c525c7445e1b
(Vemulation_mode_map_alists): New variable.
Kim F. Storm <storm@cua.dk>
parents:
43504
diff
changeset
|
1542 break; |
45235
66271fa0bf60
(current_minor_maps): Fixed resizing of cmm_maps;
Kim F. Storm <storm@cua.dk>
parents:
45222
diff
changeset
|
1543 cmm_size = newsize; |
45222
c525c7445e1b
(Vemulation_mode_map_alists): New variable.
Kim F. Storm <storm@cua.dk>
parents:
43504
diff
changeset
|
1544 } |
c525c7445e1b
(Vemulation_mode_map_alists): New variable.
Kim F. Storm <storm@cua.dk>
parents:
43504
diff
changeset
|
1545 |
c525c7445e1b
(Vemulation_mode_map_alists): New variable.
Kim F. Storm <storm@cua.dk>
parents:
43504
diff
changeset
|
1546 /* Get the keymap definition--or nil if it is not defined. */ |
68758
13c1b7c5f555
* data.c (Findirect_function): Add NOERROR arg. All callers changed
Kim F. Storm <storm@cua.dk>
parents:
68651
diff
changeset
|
1547 temp = Findirect_function (XCDR (assoc), Qt); |
45222
c525c7445e1b
(Vemulation_mode_map_alists): New variable.
Kim F. Storm <storm@cua.dk>
parents:
43504
diff
changeset
|
1548 if (!NILP (temp)) |
c525c7445e1b
(Vemulation_mode_map_alists): New variable.
Kim F. Storm <storm@cua.dk>
parents:
43504
diff
changeset
|
1549 { |
c525c7445e1b
(Vemulation_mode_map_alists): New variable.
Kim F. Storm <storm@cua.dk>
parents:
43504
diff
changeset
|
1550 cmm_modes[i] = var; |
c525c7445e1b
(Vemulation_mode_map_alists): New variable.
Kim F. Storm <storm@cua.dk>
parents:
43504
diff
changeset
|
1551 cmm_maps [i] = temp; |
c525c7445e1b
(Vemulation_mode_map_alists): New variable.
Kim F. Storm <storm@cua.dk>
parents:
43504
diff
changeset
|
1552 i++; |
c525c7445e1b
(Vemulation_mode_map_alists): New variable.
Kim F. Storm <storm@cua.dk>
parents:
43504
diff
changeset
|
1553 } |
c525c7445e1b
(Vemulation_mode_map_alists): New variable.
Kim F. Storm <storm@cua.dk>
parents:
43504
diff
changeset
|
1554 } |
c525c7445e1b
(Vemulation_mode_map_alists): New variable.
Kim F. Storm <storm@cua.dk>
parents:
43504
diff
changeset
|
1555 } |
465 | 1556 |
485 | 1557 if (modeptr) *modeptr = cmm_modes; |
1558 if (mapptr) *mapptr = cmm_maps; | |
465 | 1559 return i; |
1560 } | |
1561 | |
39689
0572449a62be
(Fkeymap_prompt, Fcurrent_active_maps): New funs.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
39682
diff
changeset
|
1562 DEFUN ("current-active-maps", Fcurrent_active_maps, Scurrent_active_maps, |
81609
7e640eac2dcb
* keymaps.texi (Active Keymaps): Document new POSITION argument of
David Kastrup <dak@gnu.org>
parents:
81281
diff
changeset
|
1563 0, 2, 0, |
41001
a17c8b15ef1b
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
40804
diff
changeset
|
1564 doc: /* Return a list of the currently active keymaps. |
a17c8b15ef1b
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
40804
diff
changeset
|
1565 OLP if non-nil indicates that we should obey `overriding-local-map' and |
81609
7e640eac2dcb
* keymaps.texi (Active Keymaps): Document new POSITION argument of
David Kastrup <dak@gnu.org>
parents:
81281
diff
changeset
|
1566 `overriding-terminal-local-map'. POSITION can specify a click position |
7e640eac2dcb
* keymaps.texi (Active Keymaps): Document new POSITION argument of
David Kastrup <dak@gnu.org>
parents:
81281
diff
changeset
|
1567 like in the respective argument of `key-binding'. */) |
109179
8cfee7d2955f
Convert DEFUNs to standard C.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
109165
diff
changeset
|
1568 (Lisp_Object olp, Lisp_Object position) |
39689
0572449a62be
(Fkeymap_prompt, Fcurrent_active_maps): New funs.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
39682
diff
changeset
|
1569 { |
81609
7e640eac2dcb
* keymaps.texi (Active Keymaps): Document new POSITION argument of
David Kastrup <dak@gnu.org>
parents:
81281
diff
changeset
|
1570 int count = SPECPDL_INDEX (); |
7e640eac2dcb
* keymaps.texi (Active Keymaps): Document new POSITION argument of
David Kastrup <dak@gnu.org>
parents:
81281
diff
changeset
|
1571 |
7e640eac2dcb
* keymaps.texi (Active Keymaps): Document new POSITION argument of
David Kastrup <dak@gnu.org>
parents:
81281
diff
changeset
|
1572 Lisp_Object keymaps; |
7e640eac2dcb
* keymaps.texi (Active Keymaps): Document new POSITION argument of
David Kastrup <dak@gnu.org>
parents:
81281
diff
changeset
|
1573 |
7e640eac2dcb
* keymaps.texi (Active Keymaps): Document new POSITION argument of
David Kastrup <dak@gnu.org>
parents:
81281
diff
changeset
|
1574 /* If a mouse click position is given, our variables are based on |
7e640eac2dcb
* keymaps.texi (Active Keymaps): Document new POSITION argument of
David Kastrup <dak@gnu.org>
parents:
81281
diff
changeset
|
1575 the buffer clicked on, not the current buffer. So we may have to |
7e640eac2dcb
* keymaps.texi (Active Keymaps): Document new POSITION argument of
David Kastrup <dak@gnu.org>
parents:
81281
diff
changeset
|
1576 switch the buffer here. */ |
107332
e09a216f2aab
Fix keyboard macro key lookup (Bug#5481).
Chong Yidong <cyd@stupidchicken.com>
parents:
106972
diff
changeset
|
1577 |
81609
7e640eac2dcb
* keymaps.texi (Active Keymaps): Document new POSITION argument of
David Kastrup <dak@gnu.org>
parents:
81281
diff
changeset
|
1578 if (CONSP (position)) |
7e640eac2dcb
* keymaps.texi (Active Keymaps): Document new POSITION argument of
David Kastrup <dak@gnu.org>
parents:
81281
diff
changeset
|
1579 { |
7e640eac2dcb
* keymaps.texi (Active Keymaps): Document new POSITION argument of
David Kastrup <dak@gnu.org>
parents:
81281
diff
changeset
|
1580 Lisp_Object window; |
107332
e09a216f2aab
Fix keyboard macro key lookup (Bug#5481).
Chong Yidong <cyd@stupidchicken.com>
parents:
106972
diff
changeset
|
1581 |
81609
7e640eac2dcb
* keymaps.texi (Active Keymaps): Document new POSITION argument of
David Kastrup <dak@gnu.org>
parents:
81281
diff
changeset
|
1582 window = POSN_WINDOW (position); |
107332
e09a216f2aab
Fix keyboard macro key lookup (Bug#5481).
Chong Yidong <cyd@stupidchicken.com>
parents:
106972
diff
changeset
|
1583 |
81609
7e640eac2dcb
* keymaps.texi (Active Keymaps): Document new POSITION argument of
David Kastrup <dak@gnu.org>
parents:
81281
diff
changeset
|
1584 if (WINDOWP (window) |
7e640eac2dcb
* keymaps.texi (Active Keymaps): Document new POSITION argument of
David Kastrup <dak@gnu.org>
parents:
81281
diff
changeset
|
1585 && BUFFERP (XWINDOW (window)->buffer) |
7e640eac2dcb
* keymaps.texi (Active Keymaps): Document new POSITION argument of
David Kastrup <dak@gnu.org>
parents:
81281
diff
changeset
|
1586 && XBUFFER (XWINDOW (window)->buffer) != current_buffer) |
7e640eac2dcb
* keymaps.texi (Active Keymaps): Document new POSITION argument of
David Kastrup <dak@gnu.org>
parents:
81281
diff
changeset
|
1587 { |
7e640eac2dcb
* keymaps.texi (Active Keymaps): Document new POSITION argument of
David Kastrup <dak@gnu.org>
parents:
81281
diff
changeset
|
1588 /* Arrange to go back to the original buffer once we're done |
7e640eac2dcb
* keymaps.texi (Active Keymaps): Document new POSITION argument of
David Kastrup <dak@gnu.org>
parents:
81281
diff
changeset
|
1589 processing the key sequence. We don't use |
7e640eac2dcb
* keymaps.texi (Active Keymaps): Document new POSITION argument of
David Kastrup <dak@gnu.org>
parents:
81281
diff
changeset
|
1590 save_excursion_{save,restore} here, in analogy to |
7e640eac2dcb
* keymaps.texi (Active Keymaps): Document new POSITION argument of
David Kastrup <dak@gnu.org>
parents:
81281
diff
changeset
|
1591 `read-key-sequence' to avoid saving point. Maybe this |
7e640eac2dcb
* keymaps.texi (Active Keymaps): Document new POSITION argument of
David Kastrup <dak@gnu.org>
parents:
81281
diff
changeset
|
1592 would not be a problem here, but it is easier to keep |
7e640eac2dcb
* keymaps.texi (Active Keymaps): Document new POSITION argument of
David Kastrup <dak@gnu.org>
parents:
81281
diff
changeset
|
1593 things the same. |
7e640eac2dcb
* keymaps.texi (Active Keymaps): Document new POSITION argument of
David Kastrup <dak@gnu.org>
parents:
81281
diff
changeset
|
1594 */ |
107332
e09a216f2aab
Fix keyboard macro key lookup (Bug#5481).
Chong Yidong <cyd@stupidchicken.com>
parents:
106972
diff
changeset
|
1595 |
81609
7e640eac2dcb
* keymaps.texi (Active Keymaps): Document new POSITION argument of
David Kastrup <dak@gnu.org>
parents:
81281
diff
changeset
|
1596 record_unwind_protect (Fset_buffer, Fcurrent_buffer ()); |
107332
e09a216f2aab
Fix keyboard macro key lookup (Bug#5481).
Chong Yidong <cyd@stupidchicken.com>
parents:
106972
diff
changeset
|
1597 |
81609
7e640eac2dcb
* keymaps.texi (Active Keymaps): Document new POSITION argument of
David Kastrup <dak@gnu.org>
parents:
81281
diff
changeset
|
1598 set_buffer_internal (XBUFFER (XWINDOW (window)->buffer)); |
7e640eac2dcb
* keymaps.texi (Active Keymaps): Document new POSITION argument of
David Kastrup <dak@gnu.org>
parents:
81281
diff
changeset
|
1599 } |
7e640eac2dcb
* keymaps.texi (Active Keymaps): Document new POSITION argument of
David Kastrup <dak@gnu.org>
parents:
81281
diff
changeset
|
1600 } |
7e640eac2dcb
* keymaps.texi (Active Keymaps): Document new POSITION argument of
David Kastrup <dak@gnu.org>
parents:
81281
diff
changeset
|
1601 |
107332
e09a216f2aab
Fix keyboard macro key lookup (Bug#5481).
Chong Yidong <cyd@stupidchicken.com>
parents:
106972
diff
changeset
|
1602 keymaps = Fcons (current_global_map, Qnil); |
39689
0572449a62be
(Fkeymap_prompt, Fcurrent_active_maps): New funs.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
39682
diff
changeset
|
1603 |
0572449a62be
(Fkeymap_prompt, Fcurrent_active_maps): New funs.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
39682
diff
changeset
|
1604 if (!NILP (olp)) |
0572449a62be
(Fkeymap_prompt, Fcurrent_active_maps): New funs.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
39682
diff
changeset
|
1605 { |
0572449a62be
(Fkeymap_prompt, Fcurrent_active_maps): New funs.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
39682
diff
changeset
|
1606 if (!NILP (current_kboard->Voverriding_terminal_local_map)) |
0572449a62be
(Fkeymap_prompt, Fcurrent_active_maps): New funs.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
39682
diff
changeset
|
1607 keymaps = Fcons (current_kboard->Voverriding_terminal_local_map, keymaps); |
59522
031c9a79c55a
(Fcurrent_active_maps): Ignore Voverriding_local_map
Richard M. Stallman <rms@gnu.org>
parents:
58450
diff
changeset
|
1608 /* The doc said that overriding-terminal-local-map should |
031c9a79c55a
(Fcurrent_active_maps): Ignore Voverriding_local_map
Richard M. Stallman <rms@gnu.org>
parents:
58450
diff
changeset
|
1609 override overriding-local-map. The code used them both, |
031c9a79c55a
(Fcurrent_active_maps): Ignore Voverriding_local_map
Richard M. Stallman <rms@gnu.org>
parents:
58450
diff
changeset
|
1610 but it seems clearer to use just one. rms, jan 2005. */ |
031c9a79c55a
(Fcurrent_active_maps): Ignore Voverriding_local_map
Richard M. Stallman <rms@gnu.org>
parents:
58450
diff
changeset
|
1611 else if (!NILP (Voverriding_local_map)) |
031c9a79c55a
(Fcurrent_active_maps): Ignore Voverriding_local_map
Richard M. Stallman <rms@gnu.org>
parents:
58450
diff
changeset
|
1612 keymaps = Fcons (Voverriding_local_map, keymaps); |
39689
0572449a62be
(Fkeymap_prompt, Fcurrent_active_maps): New funs.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
39682
diff
changeset
|
1613 } |
0572449a62be
(Fkeymap_prompt, Fcurrent_active_maps): New funs.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
39682
diff
changeset
|
1614 if (NILP (XCDR (keymaps))) |
0572449a62be
(Fkeymap_prompt, Fcurrent_active_maps): New funs.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
39682
diff
changeset
|
1615 { |
0572449a62be
(Fkeymap_prompt, Fcurrent_active_maps): New funs.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
39682
diff
changeset
|
1616 Lisp_Object *maps; |
0572449a62be
(Fkeymap_prompt, Fcurrent_active_maps): New funs.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
39682
diff
changeset
|
1617 int nmaps, i; |
0572449a62be
(Fkeymap_prompt, Fcurrent_active_maps): New funs.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
39682
diff
changeset
|
1618 |
81609
7e640eac2dcb
* keymaps.texi (Active Keymaps): Document new POSITION argument of
David Kastrup <dak@gnu.org>
parents:
81281
diff
changeset
|
1619 Lisp_Object keymap, local_map; |
7e640eac2dcb
* keymaps.texi (Active Keymaps): Document new POSITION argument of
David Kastrup <dak@gnu.org>
parents:
81281
diff
changeset
|
1620 EMACS_INT pt; |
7e640eac2dcb
* keymaps.texi (Active Keymaps): Document new POSITION argument of
David Kastrup <dak@gnu.org>
parents:
81281
diff
changeset
|
1621 |
7e640eac2dcb
* keymaps.texi (Active Keymaps): Document new POSITION argument of
David Kastrup <dak@gnu.org>
parents:
81281
diff
changeset
|
1622 pt = INTEGERP (position) ? XINT (position) |
7e640eac2dcb
* keymaps.texi (Active Keymaps): Document new POSITION argument of
David Kastrup <dak@gnu.org>
parents:
81281
diff
changeset
|
1623 : MARKERP (position) ? marker_position (position) |
7e640eac2dcb
* keymaps.texi (Active Keymaps): Document new POSITION argument of
David Kastrup <dak@gnu.org>
parents:
81281
diff
changeset
|
1624 : PT; |
7e640eac2dcb
* keymaps.texi (Active Keymaps): Document new POSITION argument of
David Kastrup <dak@gnu.org>
parents:
81281
diff
changeset
|
1625 |
7e640eac2dcb
* keymaps.texi (Active Keymaps): Document new POSITION argument of
David Kastrup <dak@gnu.org>
parents:
81281
diff
changeset
|
1626 /* Get the buffer local maps, possibly overriden by text or |
7e640eac2dcb
* keymaps.texi (Active Keymaps): Document new POSITION argument of
David Kastrup <dak@gnu.org>
parents:
81281
diff
changeset
|
1627 overlay properties */ |
7e640eac2dcb
* keymaps.texi (Active Keymaps): Document new POSITION argument of
David Kastrup <dak@gnu.org>
parents:
81281
diff
changeset
|
1628 |
107332
e09a216f2aab
Fix keyboard macro key lookup (Bug#5481).
Chong Yidong <cyd@stupidchicken.com>
parents:
106972
diff
changeset
|
1629 local_map = get_local_map (pt, current_buffer, Qlocal_map); |
e09a216f2aab
Fix keyboard macro key lookup (Bug#5481).
Chong Yidong <cyd@stupidchicken.com>
parents:
106972
diff
changeset
|
1630 keymap = get_local_map (pt, current_buffer, Qkeymap); |
81609
7e640eac2dcb
* keymaps.texi (Active Keymaps): Document new POSITION argument of
David Kastrup <dak@gnu.org>
parents:
81281
diff
changeset
|
1631 |
7e640eac2dcb
* keymaps.texi (Active Keymaps): Document new POSITION argument of
David Kastrup <dak@gnu.org>
parents:
81281
diff
changeset
|
1632 if (CONSP (position)) |
7e640eac2dcb
* keymaps.texi (Active Keymaps): Document new POSITION argument of
David Kastrup <dak@gnu.org>
parents:
81281
diff
changeset
|
1633 { |
7e640eac2dcb
* keymaps.texi (Active Keymaps): Document new POSITION argument of
David Kastrup <dak@gnu.org>
parents:
81281
diff
changeset
|
1634 Lisp_Object string; |
7e640eac2dcb
* keymaps.texi (Active Keymaps): Document new POSITION argument of
David Kastrup <dak@gnu.org>
parents:
81281
diff
changeset
|
1635 |
7e640eac2dcb
* keymaps.texi (Active Keymaps): Document new POSITION argument of
David Kastrup <dak@gnu.org>
parents:
81281
diff
changeset
|
1636 /* For a mouse click, get the local text-property keymap |
7e640eac2dcb
* keymaps.texi (Active Keymaps): Document new POSITION argument of
David Kastrup <dak@gnu.org>
parents:
81281
diff
changeset
|
1637 of the place clicked on, rather than point. */ |
107332
e09a216f2aab
Fix keyboard macro key lookup (Bug#5481).
Chong Yidong <cyd@stupidchicken.com>
parents:
106972
diff
changeset
|
1638 |
81609
7e640eac2dcb
* keymaps.texi (Active Keymaps): Document new POSITION argument of
David Kastrup <dak@gnu.org>
parents:
81281
diff
changeset
|
1639 if (POSN_INBUFFER_P (position)) |
7e640eac2dcb
* keymaps.texi (Active Keymaps): Document new POSITION argument of
David Kastrup <dak@gnu.org>
parents:
81281
diff
changeset
|
1640 { |
7e640eac2dcb
* keymaps.texi (Active Keymaps): Document new POSITION argument of
David Kastrup <dak@gnu.org>
parents:
81281
diff
changeset
|
1641 Lisp_Object pos; |
7e640eac2dcb
* keymaps.texi (Active Keymaps): Document new POSITION argument of
David Kastrup <dak@gnu.org>
parents:
81281
diff
changeset
|
1642 |
7e640eac2dcb
* keymaps.texi (Active Keymaps): Document new POSITION argument of
David Kastrup <dak@gnu.org>
parents:
81281
diff
changeset
|
1643 pos = POSN_BUFFER_POSN (position); |
7e640eac2dcb
* keymaps.texi (Active Keymaps): Document new POSITION argument of
David Kastrup <dak@gnu.org>
parents:
81281
diff
changeset
|
1644 if (INTEGERP (pos) |
7e640eac2dcb
* keymaps.texi (Active Keymaps): Document new POSITION argument of
David Kastrup <dak@gnu.org>
parents:
81281
diff
changeset
|
1645 && XINT (pos) >= BEG && XINT (pos) <= Z) |
7e640eac2dcb
* keymaps.texi (Active Keymaps): Document new POSITION argument of
David Kastrup <dak@gnu.org>
parents:
81281
diff
changeset
|
1646 { |
7e640eac2dcb
* keymaps.texi (Active Keymaps): Document new POSITION argument of
David Kastrup <dak@gnu.org>
parents:
81281
diff
changeset
|
1647 local_map = get_local_map (XINT (pos), |
7e640eac2dcb
* keymaps.texi (Active Keymaps): Document new POSITION argument of
David Kastrup <dak@gnu.org>
parents:
81281
diff
changeset
|
1648 current_buffer, Qlocal_map); |
107332
e09a216f2aab
Fix keyboard macro key lookup (Bug#5481).
Chong Yidong <cyd@stupidchicken.com>
parents:
106972
diff
changeset
|
1649 |
81609
7e640eac2dcb
* keymaps.texi (Active Keymaps): Document new POSITION argument of
David Kastrup <dak@gnu.org>
parents:
81281
diff
changeset
|
1650 keymap = get_local_map (XINT (pos), |
7e640eac2dcb
* keymaps.texi (Active Keymaps): Document new POSITION argument of
David Kastrup <dak@gnu.org>
parents:
81281
diff
changeset
|
1651 current_buffer, Qkeymap); |
7e640eac2dcb
* keymaps.texi (Active Keymaps): Document new POSITION argument of
David Kastrup <dak@gnu.org>
parents:
81281
diff
changeset
|
1652 } |
7e640eac2dcb
* keymaps.texi (Active Keymaps): Document new POSITION argument of
David Kastrup <dak@gnu.org>
parents:
81281
diff
changeset
|
1653 } |
7e640eac2dcb
* keymaps.texi (Active Keymaps): Document new POSITION argument of
David Kastrup <dak@gnu.org>
parents:
81281
diff
changeset
|
1654 |
7e640eac2dcb
* keymaps.texi (Active Keymaps): Document new POSITION argument of
David Kastrup <dak@gnu.org>
parents:
81281
diff
changeset
|
1655 /* If on a mode line string with a local keymap, |
7e640eac2dcb
* keymaps.texi (Active Keymaps): Document new POSITION argument of
David Kastrup <dak@gnu.org>
parents:
81281
diff
changeset
|
1656 or for a click on a string, i.e. overlay string or a |
7e640eac2dcb
* keymaps.texi (Active Keymaps): Document new POSITION argument of
David Kastrup <dak@gnu.org>
parents:
81281
diff
changeset
|
1657 string displayed via the `display' property, |
7e640eac2dcb
* keymaps.texi (Active Keymaps): Document new POSITION argument of
David Kastrup <dak@gnu.org>
parents:
81281
diff
changeset
|
1658 consider `local-map' and `keymap' properties of |
7e640eac2dcb
* keymaps.texi (Active Keymaps): Document new POSITION argument of
David Kastrup <dak@gnu.org>
parents:
81281
diff
changeset
|
1659 that string. */ |
107332
e09a216f2aab
Fix keyboard macro key lookup (Bug#5481).
Chong Yidong <cyd@stupidchicken.com>
parents:
106972
diff
changeset
|
1660 |
81609
7e640eac2dcb
* keymaps.texi (Active Keymaps): Document new POSITION argument of
David Kastrup <dak@gnu.org>
parents:
81281
diff
changeset
|
1661 if (string = POSN_STRING (position), |
7e640eac2dcb
* keymaps.texi (Active Keymaps): Document new POSITION argument of
David Kastrup <dak@gnu.org>
parents:
81281
diff
changeset
|
1662 (CONSP (string) && STRINGP (XCAR (string)))) |
7e640eac2dcb
* keymaps.texi (Active Keymaps): Document new POSITION argument of
David Kastrup <dak@gnu.org>
parents:
81281
diff
changeset
|
1663 { |
7e640eac2dcb
* keymaps.texi (Active Keymaps): Document new POSITION argument of
David Kastrup <dak@gnu.org>
parents:
81281
diff
changeset
|
1664 Lisp_Object pos, map; |
107332
e09a216f2aab
Fix keyboard macro key lookup (Bug#5481).
Chong Yidong <cyd@stupidchicken.com>
parents:
106972
diff
changeset
|
1665 |
81609
7e640eac2dcb
* keymaps.texi (Active Keymaps): Document new POSITION argument of
David Kastrup <dak@gnu.org>
parents:
81281
diff
changeset
|
1666 pos = XCDR (string); |
7e640eac2dcb
* keymaps.texi (Active Keymaps): Document new POSITION argument of
David Kastrup <dak@gnu.org>
parents:
81281
diff
changeset
|
1667 string = XCAR (string); |
7e640eac2dcb
* keymaps.texi (Active Keymaps): Document new POSITION argument of
David Kastrup <dak@gnu.org>
parents:
81281
diff
changeset
|
1668 if (INTEGERP (pos) |
7e640eac2dcb
* keymaps.texi (Active Keymaps): Document new POSITION argument of
David Kastrup <dak@gnu.org>
parents:
81281
diff
changeset
|
1669 && XINT (pos) >= 0 |
7e640eac2dcb
* keymaps.texi (Active Keymaps): Document new POSITION argument of
David Kastrup <dak@gnu.org>
parents:
81281
diff
changeset
|
1670 && XINT (pos) < SCHARS (string)) |
7e640eac2dcb
* keymaps.texi (Active Keymaps): Document new POSITION argument of
David Kastrup <dak@gnu.org>
parents:
81281
diff
changeset
|
1671 { |
7e640eac2dcb
* keymaps.texi (Active Keymaps): Document new POSITION argument of
David Kastrup <dak@gnu.org>
parents:
81281
diff
changeset
|
1672 map = Fget_text_property (pos, Qlocal_map, string); |
7e640eac2dcb
* keymaps.texi (Active Keymaps): Document new POSITION argument of
David Kastrup <dak@gnu.org>
parents:
81281
diff
changeset
|
1673 if (!NILP (map)) |
7e640eac2dcb
* keymaps.texi (Active Keymaps): Document new POSITION argument of
David Kastrup <dak@gnu.org>
parents:
81281
diff
changeset
|
1674 local_map = map; |
7e640eac2dcb
* keymaps.texi (Active Keymaps): Document new POSITION argument of
David Kastrup <dak@gnu.org>
parents:
81281
diff
changeset
|
1675 |
7e640eac2dcb
* keymaps.texi (Active Keymaps): Document new POSITION argument of
David Kastrup <dak@gnu.org>
parents:
81281
diff
changeset
|
1676 map = Fget_text_property (pos, Qkeymap, string); |
7e640eac2dcb
* keymaps.texi (Active Keymaps): Document new POSITION argument of
David Kastrup <dak@gnu.org>
parents:
81281
diff
changeset
|
1677 if (!NILP (map)) |
7e640eac2dcb
* keymaps.texi (Active Keymaps): Document new POSITION argument of
David Kastrup <dak@gnu.org>
parents:
81281
diff
changeset
|
1678 keymap = map; |
7e640eac2dcb
* keymaps.texi (Active Keymaps): Document new POSITION argument of
David Kastrup <dak@gnu.org>
parents:
81281
diff
changeset
|
1679 } |
7e640eac2dcb
* keymaps.texi (Active Keymaps): Document new POSITION argument of
David Kastrup <dak@gnu.org>
parents:
81281
diff
changeset
|
1680 } |
107332
e09a216f2aab
Fix keyboard macro key lookup (Bug#5481).
Chong Yidong <cyd@stupidchicken.com>
parents:
106972
diff
changeset
|
1681 |
81609
7e640eac2dcb
* keymaps.texi (Active Keymaps): Document new POSITION argument of
David Kastrup <dak@gnu.org>
parents:
81281
diff
changeset
|
1682 } |
7e640eac2dcb
* keymaps.texi (Active Keymaps): Document new POSITION argument of
David Kastrup <dak@gnu.org>
parents:
81281
diff
changeset
|
1683 |
7e640eac2dcb
* keymaps.texi (Active Keymaps): Document new POSITION argument of
David Kastrup <dak@gnu.org>
parents:
81281
diff
changeset
|
1684 if (!NILP (local_map)) |
7e640eac2dcb
* keymaps.texi (Active Keymaps): Document new POSITION argument of
David Kastrup <dak@gnu.org>
parents:
81281
diff
changeset
|
1685 keymaps = Fcons (local_map, keymaps); |
39689
0572449a62be
(Fkeymap_prompt, Fcurrent_active_maps): New funs.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
39682
diff
changeset
|
1686 |
59522
031c9a79c55a
(Fcurrent_active_maps): Ignore Voverriding_local_map
Richard M. Stallman <rms@gnu.org>
parents:
58450
diff
changeset
|
1687 /* Now put all the minor mode keymaps on the list. */ |
39689
0572449a62be
(Fkeymap_prompt, Fcurrent_active_maps): New funs.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
39682
diff
changeset
|
1688 nmaps = current_minor_maps (0, &maps); |
0572449a62be
(Fkeymap_prompt, Fcurrent_active_maps): New funs.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
39682
diff
changeset
|
1689 |
0572449a62be
(Fkeymap_prompt, Fcurrent_active_maps): New funs.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
39682
diff
changeset
|
1690 for (i = --nmaps; i >= 0; i--) |
0572449a62be
(Fkeymap_prompt, Fcurrent_active_maps): New funs.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
39682
diff
changeset
|
1691 if (!NILP (maps[i])) |
0572449a62be
(Fkeymap_prompt, Fcurrent_active_maps): New funs.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
39682
diff
changeset
|
1692 keymaps = Fcons (maps[i], keymaps); |
42510
dde71e46eeeb
(Fcurrent_active_maps): Put the `keymap' property map first.
Richard M. Stallman <rms@gnu.org>
parents:
42404
diff
changeset
|
1693 |
81609
7e640eac2dcb
* keymaps.texi (Active Keymaps): Document new POSITION argument of
David Kastrup <dak@gnu.org>
parents:
81281
diff
changeset
|
1694 if (!NILP (keymap)) |
7e640eac2dcb
* keymaps.texi (Active Keymaps): Document new POSITION argument of
David Kastrup <dak@gnu.org>
parents:
81281
diff
changeset
|
1695 keymaps = Fcons (keymap, keymaps); |
39689
0572449a62be
(Fkeymap_prompt, Fcurrent_active_maps): New funs.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
39682
diff
changeset
|
1696 } |
45279
220c13a65624
(keymap_parent): New fun, extracted from Fkeymap_parent.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
45235
diff
changeset
|
1697 |
81609
7e640eac2dcb
* keymaps.texi (Active Keymaps): Document new POSITION argument of
David Kastrup <dak@gnu.org>
parents:
81281
diff
changeset
|
1698 unbind_to (count, Qnil); |
7e640eac2dcb
* keymaps.texi (Active Keymaps): Document new POSITION argument of
David Kastrup <dak@gnu.org>
parents:
81281
diff
changeset
|
1699 |
39689
0572449a62be
(Fkeymap_prompt, Fcurrent_active_maps): New funs.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
39682
diff
changeset
|
1700 return keymaps; |
0572449a62be
(Fkeymap_prompt, Fcurrent_active_maps): New funs.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
39682
diff
changeset
|
1701 } |
0572449a62be
(Fkeymap_prompt, Fcurrent_active_maps): New funs.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
39682
diff
changeset
|
1702 |
7998
d4b5f4dd9c51
(Flookup_key): Add gcpro.
Richard M. Stallman <rms@gnu.org>
parents:
7894
diff
changeset
|
1703 /* GC is possible in this function if it autoloads a keymap. */ |
d4b5f4dd9c51
(Flookup_key): Add gcpro.
Richard M. Stallman <rms@gnu.org>
parents:
7894
diff
changeset
|
1704 |
72889
25c755416160
* NEWS: explain new behavior and arguments of `key-binding' and
David Kastrup <dak@gnu.org>
parents:
72806
diff
changeset
|
1705 DEFUN ("key-binding", Fkey_binding, Skey_binding, 1, 4, 0, |
41001
a17c8b15ef1b
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
40804
diff
changeset
|
1706 doc: /* Return the binding for command KEY in current keymaps. |
a17c8b15ef1b
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
40804
diff
changeset
|
1707 KEY is a string or vector, a sequence of keystrokes. |
a17c8b15ef1b
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
40804
diff
changeset
|
1708 The binding is probably a symbol with a function definition. |
a17c8b15ef1b
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
40804
diff
changeset
|
1709 |
a17c8b15ef1b
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
40804
diff
changeset
|
1710 Normally, `key-binding' ignores bindings for t, which act as default |
a17c8b15ef1b
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
40804
diff
changeset
|
1711 bindings, used when nothing else in the keymap applies; this makes it |
a17c8b15ef1b
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
40804
diff
changeset
|
1712 usable as a general function for probing keymaps. However, if the |
a17c8b15ef1b
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
40804
diff
changeset
|
1713 optional second argument ACCEPT-DEFAULT is non-nil, `key-binding' does |
43152
0029b0259426
(Fdefine_key): Allow symbol as KEY argument for
Kim F. Storm <storm@cua.dk>
parents:
42510
diff
changeset
|
1714 recognize the default bindings, just as `read-key-sequence' does. |
0029b0259426
(Fdefine_key): Allow symbol as KEY argument for
Kim F. Storm <storm@cua.dk>
parents:
42510
diff
changeset
|
1715 |
0029b0259426
(Fdefine_key): Allow symbol as KEY argument for
Kim F. Storm <storm@cua.dk>
parents:
42510
diff
changeset
|
1716 Like the normal command loop, `key-binding' will remap the command |
0029b0259426
(Fdefine_key): Allow symbol as KEY argument for
Kim F. Storm <storm@cua.dk>
parents:
42510
diff
changeset
|
1717 resulting from looking up KEY by looking up the command in the |
46310
70bccd2fee9f
(Fkey_binding): Fix typo.
Markus Rost <rost@math.uni-bielefeld.de>
parents:
46293
diff
changeset
|
1718 current keymaps. However, if the optional third argument NO-REMAP |
72889
25c755416160
* NEWS: explain new behavior and arguments of `key-binding' and
David Kastrup <dak@gnu.org>
parents:
72806
diff
changeset
|
1719 is non-nil, `key-binding' returns the unmapped command. |
25c755416160
* NEWS: explain new behavior and arguments of `key-binding' and
David Kastrup <dak@gnu.org>
parents:
72806
diff
changeset
|
1720 |
25c755416160
* NEWS: explain new behavior and arguments of `key-binding' and
David Kastrup <dak@gnu.org>
parents:
72806
diff
changeset
|
1721 If KEY is a key sequence initiated with the mouse, the used keymaps |
25c755416160
* NEWS: explain new behavior and arguments of `key-binding' and
David Kastrup <dak@gnu.org>
parents:
72806
diff
changeset
|
1722 will depend on the clicked mouse position with regard to the buffer |
25c755416160
* NEWS: explain new behavior and arguments of `key-binding' and
David Kastrup <dak@gnu.org>
parents:
72806
diff
changeset
|
1723 and possible local keymaps on strings. |
25c755416160
* NEWS: explain new behavior and arguments of `key-binding' and
David Kastrup <dak@gnu.org>
parents:
72806
diff
changeset
|
1724 |
25c755416160
* NEWS: explain new behavior and arguments of `key-binding' and
David Kastrup <dak@gnu.org>
parents:
72806
diff
changeset
|
1725 If the optional argument POSITION is non-nil, it specifies a mouse |
25c755416160
* NEWS: explain new behavior and arguments of `key-binding' and
David Kastrup <dak@gnu.org>
parents:
72806
diff
changeset
|
1726 position as returned by `event-start' and `event-end', and the lookup |
25c755416160
* NEWS: explain new behavior and arguments of `key-binding' and
David Kastrup <dak@gnu.org>
parents:
72806
diff
changeset
|
1727 occurs in the keymaps associated with it instead of KEY. It can also |
25c755416160
* NEWS: explain new behavior and arguments of `key-binding' and
David Kastrup <dak@gnu.org>
parents:
72806
diff
changeset
|
1728 be a number or marker, in which case the keymap properties at the |
25c755416160
* NEWS: explain new behavior and arguments of `key-binding' and
David Kastrup <dak@gnu.org>
parents:
72806
diff
changeset
|
1729 specified buffer position instead of point are used. |
25c755416160
* NEWS: explain new behavior and arguments of `key-binding' and
David Kastrup <dak@gnu.org>
parents:
72806
diff
changeset
|
1730 */) |
109179
8cfee7d2955f
Convert DEFUNs to standard C.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
109165
diff
changeset
|
1731 (Lisp_Object key, Lisp_Object accept_default, Lisp_Object no_remap, Lisp_Object position) |
250 | 1732 { |
465 | 1733 Lisp_Object *maps, value; |
1734 int nmaps, i; | |
72889
25c755416160
* NEWS: explain new behavior and arguments of `key-binding' and
David Kastrup <dak@gnu.org>
parents:
72806
diff
changeset
|
1735 struct gcpro gcpro1, gcpro2; |
25c755416160
* NEWS: explain new behavior and arguments of `key-binding' and
David Kastrup <dak@gnu.org>
parents:
72806
diff
changeset
|
1736 int count = SPECPDL_INDEX (); |
25c755416160
* NEWS: explain new behavior and arguments of `key-binding' and
David Kastrup <dak@gnu.org>
parents:
72806
diff
changeset
|
1737 |
25c755416160
* NEWS: explain new behavior and arguments of `key-binding' and
David Kastrup <dak@gnu.org>
parents:
72806
diff
changeset
|
1738 GCPRO2 (key, position); |
25c755416160
* NEWS: explain new behavior and arguments of `key-binding' and
David Kastrup <dak@gnu.org>
parents:
72806
diff
changeset
|
1739 |
72989
f9742f561ed9
Include alloca.h if available.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
72889
diff
changeset
|
1740 if (NILP (position) && VECTORP (key)) |
72795
64e86769392f
* keymap.c (Fkey_binding): Check for local keymap for mouse click
Chong Yidong <cyd@stupidchicken.com>
parents:
72074
diff
changeset
|
1741 { |
72989
f9742f561ed9
Include alloca.h if available.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
72889
diff
changeset
|
1742 Lisp_Object event |
f9742f561ed9
Include alloca.h if available.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
72889
diff
changeset
|
1743 /* mouse events may have a symbolic prefix indicating the |
f9742f561ed9
Include alloca.h if available.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
72889
diff
changeset
|
1744 scrollbar or mode line */ |
f9742f561ed9
Include alloca.h if available.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
72889
diff
changeset
|
1745 = AREF (key, SYMBOLP (AREF (key, 0)) && ASIZE (key) > 1 ? 1 : 0); |
72889
25c755416160
* NEWS: explain new behavior and arguments of `key-binding' and
David Kastrup <dak@gnu.org>
parents:
72806
diff
changeset
|
1746 |
25c755416160
* NEWS: explain new behavior and arguments of `key-binding' and
David Kastrup <dak@gnu.org>
parents:
72806
diff
changeset
|
1747 /* We are not interested in locations without event data */ |
25c755416160
* NEWS: explain new behavior and arguments of `key-binding' and
David Kastrup <dak@gnu.org>
parents:
72806
diff
changeset
|
1748 |
76269 | 1749 if (EVENT_HAS_PARAMETERS (event) && CONSP (XCDR (event))) |
73350
1a3368a80879
* keymap.c (Fkey_binding): Check Lisp_Object types before doing
Chong Yidong <cyd@stupidchicken.com>
parents:
73152
diff
changeset
|
1750 { |
1a3368a80879
* keymap.c (Fkey_binding): Check Lisp_Object types before doing
Chong Yidong <cyd@stupidchicken.com>
parents:
73152
diff
changeset
|
1751 Lisp_Object kind = EVENT_HEAD_KIND (EVENT_HEAD (event)); |
76269 | 1752 if (EQ (kind, Qmouse_click)) |
73350
1a3368a80879
* keymap.c (Fkey_binding): Check Lisp_Object types before doing
Chong Yidong <cyd@stupidchicken.com>
parents:
73152
diff
changeset
|
1753 position = EVENT_START (event); |
1a3368a80879
* keymap.c (Fkey_binding): Check Lisp_Object types before doing
Chong Yidong <cyd@stupidchicken.com>
parents:
73152
diff
changeset
|
1754 } |
72889
25c755416160
* NEWS: explain new behavior and arguments of `key-binding' and
David Kastrup <dak@gnu.org>
parents:
72806
diff
changeset
|
1755 } |
25c755416160
* NEWS: explain new behavior and arguments of `key-binding' and
David Kastrup <dak@gnu.org>
parents:
72806
diff
changeset
|
1756 |
25c755416160
* NEWS: explain new behavior and arguments of `key-binding' and
David Kastrup <dak@gnu.org>
parents:
72806
diff
changeset
|
1757 /* Key sequences beginning with mouse clicks |
25c755416160
* NEWS: explain new behavior and arguments of `key-binding' and
David Kastrup <dak@gnu.org>
parents:
72806
diff
changeset
|
1758 are read using the keymaps of the buffer clicked on, not |
25c755416160
* NEWS: explain new behavior and arguments of `key-binding' and
David Kastrup <dak@gnu.org>
parents:
72806
diff
changeset
|
1759 the current buffer. So we may have to switch the buffer |
25c755416160
* NEWS: explain new behavior and arguments of `key-binding' and
David Kastrup <dak@gnu.org>
parents:
72806
diff
changeset
|
1760 here. */ |
74574
3c809b430d91
(Flookup_key): Doc fix.
Juanma Barranquero <lekktu@gmail.com>
parents:
73350
diff
changeset
|
1761 |
72889
25c755416160
* NEWS: explain new behavior and arguments of `key-binding' and
David Kastrup <dak@gnu.org>
parents:
72806
diff
changeset
|
1762 if (CONSP (position)) |
25c755416160
* NEWS: explain new behavior and arguments of `key-binding' and
David Kastrup <dak@gnu.org>
parents:
72806
diff
changeset
|
1763 { |
25c755416160
* NEWS: explain new behavior and arguments of `key-binding' and
David Kastrup <dak@gnu.org>
parents:
72806
diff
changeset
|
1764 Lisp_Object window; |
74574
3c809b430d91
(Flookup_key): Doc fix.
Juanma Barranquero <lekktu@gmail.com>
parents:
73350
diff
changeset
|
1765 |
72889
25c755416160
* NEWS: explain new behavior and arguments of `key-binding' and
David Kastrup <dak@gnu.org>
parents:
72806
diff
changeset
|
1766 window = POSN_WINDOW (position); |
74574
3c809b430d91
(Flookup_key): Doc fix.
Juanma Barranquero <lekktu@gmail.com>
parents:
73350
diff
changeset
|
1767 |
72889
25c755416160
* NEWS: explain new behavior and arguments of `key-binding' and
David Kastrup <dak@gnu.org>
parents:
72806
diff
changeset
|
1768 if (WINDOWP (window) |
25c755416160
* NEWS: explain new behavior and arguments of `key-binding' and
David Kastrup <dak@gnu.org>
parents:
72806
diff
changeset
|
1769 && BUFFERP (XWINDOW (window)->buffer) |
25c755416160
* NEWS: explain new behavior and arguments of `key-binding' and
David Kastrup <dak@gnu.org>
parents:
72806
diff
changeset
|
1770 && XBUFFER (XWINDOW (window)->buffer) != current_buffer) |
72795
64e86769392f
* keymap.c (Fkey_binding): Check for local keymap for mouse click
Chong Yidong <cyd@stupidchicken.com>
parents:
72074
diff
changeset
|
1771 { |
72889
25c755416160
* NEWS: explain new behavior and arguments of `key-binding' and
David Kastrup <dak@gnu.org>
parents:
72806
diff
changeset
|
1772 /* Arrange to go back to the original buffer once we're done |
25c755416160
* NEWS: explain new behavior and arguments of `key-binding' and
David Kastrup <dak@gnu.org>
parents:
72806
diff
changeset
|
1773 processing the key sequence. We don't use |
25c755416160
* NEWS: explain new behavior and arguments of `key-binding' and
David Kastrup <dak@gnu.org>
parents:
72806
diff
changeset
|
1774 save_excursion_{save,restore} here, in analogy to |
25c755416160
* NEWS: explain new behavior and arguments of `key-binding' and
David Kastrup <dak@gnu.org>
parents:
72806
diff
changeset
|
1775 `read-key-sequence' to avoid saving point. Maybe this |
25c755416160
* NEWS: explain new behavior and arguments of `key-binding' and
David Kastrup <dak@gnu.org>
parents:
72806
diff
changeset
|
1776 would not be a problem here, but it is easier to keep |
25c755416160
* NEWS: explain new behavior and arguments of `key-binding' and
David Kastrup <dak@gnu.org>
parents:
72806
diff
changeset
|
1777 things the same. |
25c755416160
* NEWS: explain new behavior and arguments of `key-binding' and
David Kastrup <dak@gnu.org>
parents:
72806
diff
changeset
|
1778 */ |
74574
3c809b430d91
(Flookup_key): Doc fix.
Juanma Barranquero <lekktu@gmail.com>
parents:
73350
diff
changeset
|
1779 |
72889
25c755416160
* NEWS: explain new behavior and arguments of `key-binding' and
David Kastrup <dak@gnu.org>
parents:
72806
diff
changeset
|
1780 record_unwind_protect (Fset_buffer, Fcurrent_buffer ()); |
74574
3c809b430d91
(Flookup_key): Doc fix.
Juanma Barranquero <lekktu@gmail.com>
parents:
73350
diff
changeset
|
1781 |
72889
25c755416160
* NEWS: explain new behavior and arguments of `key-binding' and
David Kastrup <dak@gnu.org>
parents:
72806
diff
changeset
|
1782 set_buffer_internal (XBUFFER (XWINDOW (window)->buffer)); |
72795
64e86769392f
* keymap.c (Fkey_binding): Check for local keymap for mouse click
Chong Yidong <cyd@stupidchicken.com>
parents:
72074
diff
changeset
|
1783 } |
64e86769392f
* keymap.c (Fkey_binding): Check for local keymap for mouse click
Chong Yidong <cyd@stupidchicken.com>
parents:
72074
diff
changeset
|
1784 } |
74574
3c809b430d91
(Flookup_key): Doc fix.
Juanma Barranquero <lekktu@gmail.com>
parents:
73350
diff
changeset
|
1785 |
72889
25c755416160
* NEWS: explain new behavior and arguments of `key-binding' and
David Kastrup <dak@gnu.org>
parents:
72806
diff
changeset
|
1786 if (! NILP (current_kboard->Voverriding_terminal_local_map)) |
12262
a7d5578ebb25
(Fkey_binding, describe_buffer_bindings):
Karl Heuer <kwzh@gnu.org>
parents:
12151
diff
changeset
|
1787 { |
a7d5578ebb25
(Fkey_binding, describe_buffer_bindings):
Karl Heuer <kwzh@gnu.org>
parents:
12151
diff
changeset
|
1788 value = Flookup_key (current_kboard->Voverriding_terminal_local_map, |
a7d5578ebb25
(Fkey_binding, describe_buffer_bindings):
Karl Heuer <kwzh@gnu.org>
parents:
12151
diff
changeset
|
1789 key, accept_default); |
a7d5578ebb25
(Fkey_binding, describe_buffer_bindings):
Karl Heuer <kwzh@gnu.org>
parents:
12151
diff
changeset
|
1790 if (! NILP (value) && !INTEGERP (value)) |
43152
0029b0259426
(Fdefine_key): Allow symbol as KEY argument for
Kim F. Storm <storm@cua.dk>
parents:
42510
diff
changeset
|
1791 goto done; |
12262
a7d5578ebb25
(Fkey_binding, describe_buffer_bindings):
Karl Heuer <kwzh@gnu.org>
parents:
12151
diff
changeset
|
1792 } |
72889
25c755416160
* NEWS: explain new behavior and arguments of `key-binding' and
David Kastrup <dak@gnu.org>
parents:
72806
diff
changeset
|
1793 else if (! NILP (Voverriding_local_map)) |
250 | 1794 { |
5613
cad51b2de6cd
(Fkey_binding): Handle Voverriding_local_map.
Richard M. Stallman <rms@gnu.org>
parents:
5551
diff
changeset
|
1795 value = Flookup_key (Voverriding_local_map, key, accept_default); |
9123
c225137ddefb
(get_keyelt, store_in_keymap, Fcopy_keymap, Fdefine_key, Flookup_key,
Karl Heuer <kwzh@gnu.org>
parents:
8922
diff
changeset
|
1796 if (! NILP (value) && !INTEGERP (value)) |
43152
0029b0259426
(Fdefine_key): Allow symbol as KEY argument for
Kim F. Storm <storm@cua.dk>
parents:
42510
diff
changeset
|
1797 goto done; |
250 | 1798 } |
5613
cad51b2de6cd
(Fkey_binding): Handle Voverriding_local_map.
Richard M. Stallman <rms@gnu.org>
parents:
5551
diff
changeset
|
1799 else |
45619
dbd65bd8bb4f
(describe_command): Cast `current_column' return value to int.
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
45404
diff
changeset
|
1800 { |
72889
25c755416160
* NEWS: explain new behavior and arguments of `key-binding' and
David Kastrup <dak@gnu.org>
parents:
72806
diff
changeset
|
1801 Lisp_Object keymap, local_map; |
25c755416160
* NEWS: explain new behavior and arguments of `key-binding' and
David Kastrup <dak@gnu.org>
parents:
72806
diff
changeset
|
1802 EMACS_INT pt; |
25c755416160
* NEWS: explain new behavior and arguments of `key-binding' and
David Kastrup <dak@gnu.org>
parents:
72806
diff
changeset
|
1803 |
25c755416160
* NEWS: explain new behavior and arguments of `key-binding' and
David Kastrup <dak@gnu.org>
parents:
72806
diff
changeset
|
1804 pt = INTEGERP (position) ? XINT (position) |
25c755416160
* NEWS: explain new behavior and arguments of `key-binding' and
David Kastrup <dak@gnu.org>
parents:
72806
diff
changeset
|
1805 : MARKERP (position) ? marker_position (position) |
25c755416160
* NEWS: explain new behavior and arguments of `key-binding' and
David Kastrup <dak@gnu.org>
parents:
72806
diff
changeset
|
1806 : PT; |
25c755416160
* NEWS: explain new behavior and arguments of `key-binding' and
David Kastrup <dak@gnu.org>
parents:
72806
diff
changeset
|
1807 |
74574
3c809b430d91
(Flookup_key): Doc fix.
Juanma Barranquero <lekktu@gmail.com>
parents:
73350
diff
changeset
|
1808 local_map = get_local_map (pt, current_buffer, Qlocal_map); |
3c809b430d91
(Flookup_key): Doc fix.
Juanma Barranquero <lekktu@gmail.com>
parents:
73350
diff
changeset
|
1809 keymap = get_local_map (pt, current_buffer, Qkeymap); |
72889
25c755416160
* NEWS: explain new behavior and arguments of `key-binding' and
David Kastrup <dak@gnu.org>
parents:
72806
diff
changeset
|
1810 |
25c755416160
* NEWS: explain new behavior and arguments of `key-binding' and
David Kastrup <dak@gnu.org>
parents:
72806
diff
changeset
|
1811 if (CONSP (position)) |
42510
dde71e46eeeb
(Fcurrent_active_maps): Put the `keymap' property map first.
Richard M. Stallman <rms@gnu.org>
parents:
42404
diff
changeset
|
1812 { |
72989
f9742f561ed9
Include alloca.h if available.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
72889
diff
changeset
|
1813 Lisp_Object string; |
72889
25c755416160
* NEWS: explain new behavior and arguments of `key-binding' and
David Kastrup <dak@gnu.org>
parents:
72806
diff
changeset
|
1814 |
25c755416160
* NEWS: explain new behavior and arguments of `key-binding' and
David Kastrup <dak@gnu.org>
parents:
72806
diff
changeset
|
1815 /* For a mouse click, get the local text-property keymap |
25c755416160
* NEWS: explain new behavior and arguments of `key-binding' and
David Kastrup <dak@gnu.org>
parents:
72806
diff
changeset
|
1816 of the place clicked on, rather than point. */ |
74574
3c809b430d91
(Flookup_key): Doc fix.
Juanma Barranquero <lekktu@gmail.com>
parents:
73350
diff
changeset
|
1817 |
72889
25c755416160
* NEWS: explain new behavior and arguments of `key-binding' and
David Kastrup <dak@gnu.org>
parents:
72806
diff
changeset
|
1818 if (POSN_INBUFFER_P (position)) |
25c755416160
* NEWS: explain new behavior and arguments of `key-binding' and
David Kastrup <dak@gnu.org>
parents:
72806
diff
changeset
|
1819 { |
25c755416160
* NEWS: explain new behavior and arguments of `key-binding' and
David Kastrup <dak@gnu.org>
parents:
72806
diff
changeset
|
1820 Lisp_Object pos; |
25c755416160
* NEWS: explain new behavior and arguments of `key-binding' and
David Kastrup <dak@gnu.org>
parents:
72806
diff
changeset
|
1821 |
25c755416160
* NEWS: explain new behavior and arguments of `key-binding' and
David Kastrup <dak@gnu.org>
parents:
72806
diff
changeset
|
1822 pos = POSN_BUFFER_POSN (position); |
25c755416160
* NEWS: explain new behavior and arguments of `key-binding' and
David Kastrup <dak@gnu.org>
parents:
72806
diff
changeset
|
1823 if (INTEGERP (pos) |
25c755416160
* NEWS: explain new behavior and arguments of `key-binding' and
David Kastrup <dak@gnu.org>
parents:
72806
diff
changeset
|
1824 && XINT (pos) >= BEG && XINT (pos) <= Z) |
25c755416160
* NEWS: explain new behavior and arguments of `key-binding' and
David Kastrup <dak@gnu.org>
parents:
72806
diff
changeset
|
1825 { |
25c755416160
* NEWS: explain new behavior and arguments of `key-binding' and
David Kastrup <dak@gnu.org>
parents:
72806
diff
changeset
|
1826 local_map = get_local_map (XINT (pos), |
25c755416160
* NEWS: explain new behavior and arguments of `key-binding' and
David Kastrup <dak@gnu.org>
parents:
72806
diff
changeset
|
1827 current_buffer, Qlocal_map); |
74574
3c809b430d91
(Flookup_key): Doc fix.
Juanma Barranquero <lekktu@gmail.com>
parents:
73350
diff
changeset
|
1828 |
72889
25c755416160
* NEWS: explain new behavior and arguments of `key-binding' and
David Kastrup <dak@gnu.org>
parents:
72806
diff
changeset
|
1829 keymap = get_local_map (XINT (pos), |
25c755416160
* NEWS: explain new behavior and arguments of `key-binding' and
David Kastrup <dak@gnu.org>
parents:
72806
diff
changeset
|
1830 current_buffer, Qkeymap); |
25c755416160
* NEWS: explain new behavior and arguments of `key-binding' and
David Kastrup <dak@gnu.org>
parents:
72806
diff
changeset
|
1831 } |
25c755416160
* NEWS: explain new behavior and arguments of `key-binding' and
David Kastrup <dak@gnu.org>
parents:
72806
diff
changeset
|
1832 } |
25c755416160
* NEWS: explain new behavior and arguments of `key-binding' and
David Kastrup <dak@gnu.org>
parents:
72806
diff
changeset
|
1833 |
25c755416160
* NEWS: explain new behavior and arguments of `key-binding' and
David Kastrup <dak@gnu.org>
parents:
72806
diff
changeset
|
1834 /* If on a mode line string with a local keymap, |
25c755416160
* NEWS: explain new behavior and arguments of `key-binding' and
David Kastrup <dak@gnu.org>
parents:
72806
diff
changeset
|
1835 or for a click on a string, i.e. overlay string or a |
25c755416160
* NEWS: explain new behavior and arguments of `key-binding' and
David Kastrup <dak@gnu.org>
parents:
72806
diff
changeset
|
1836 string displayed via the `display' property, |
25c755416160
* NEWS: explain new behavior and arguments of `key-binding' and
David Kastrup <dak@gnu.org>
parents:
72806
diff
changeset
|
1837 consider `local-map' and `keymap' properties of |
25c755416160
* NEWS: explain new behavior and arguments of `key-binding' and
David Kastrup <dak@gnu.org>
parents:
72806
diff
changeset
|
1838 that string. */ |
74574
3c809b430d91
(Flookup_key): Doc fix.
Juanma Barranquero <lekktu@gmail.com>
parents:
73350
diff
changeset
|
1839 |
72889
25c755416160
* NEWS: explain new behavior and arguments of `key-binding' and
David Kastrup <dak@gnu.org>
parents:
72806
diff
changeset
|
1840 if (string = POSN_STRING (position), |
25c755416160
* NEWS: explain new behavior and arguments of `key-binding' and
David Kastrup <dak@gnu.org>
parents:
72806
diff
changeset
|
1841 (CONSP (string) && STRINGP (XCAR (string)))) |
25c755416160
* NEWS: explain new behavior and arguments of `key-binding' and
David Kastrup <dak@gnu.org>
parents:
72806
diff
changeset
|
1842 { |
25c755416160
* NEWS: explain new behavior and arguments of `key-binding' and
David Kastrup <dak@gnu.org>
parents:
72806
diff
changeset
|
1843 Lisp_Object pos, map; |
74574
3c809b430d91
(Flookup_key): Doc fix.
Juanma Barranquero <lekktu@gmail.com>
parents:
73350
diff
changeset
|
1844 |
72889
25c755416160
* NEWS: explain new behavior and arguments of `key-binding' and
David Kastrup <dak@gnu.org>
parents:
72806
diff
changeset
|
1845 pos = XCDR (string); |
25c755416160
* NEWS: explain new behavior and arguments of `key-binding' and
David Kastrup <dak@gnu.org>
parents:
72806
diff
changeset
|
1846 string = XCAR (string); |
73350
1a3368a80879
* keymap.c (Fkey_binding): Check Lisp_Object types before doing
Chong Yidong <cyd@stupidchicken.com>
parents:
73152
diff
changeset
|
1847 if (INTEGERP (pos) |
1a3368a80879
* keymap.c (Fkey_binding): Check Lisp_Object types before doing
Chong Yidong <cyd@stupidchicken.com>
parents:
73152
diff
changeset
|
1848 && XINT (pos) >= 0 |
72889
25c755416160
* NEWS: explain new behavior and arguments of `key-binding' and
David Kastrup <dak@gnu.org>
parents:
72806
diff
changeset
|
1849 && XINT (pos) < SCHARS (string)) |
25c755416160
* NEWS: explain new behavior and arguments of `key-binding' and
David Kastrup <dak@gnu.org>
parents:
72806
diff
changeset
|
1850 { |
25c755416160
* NEWS: explain new behavior and arguments of `key-binding' and
David Kastrup <dak@gnu.org>
parents:
72806
diff
changeset
|
1851 map = Fget_text_property (pos, Qlocal_map, string); |
25c755416160
* NEWS: explain new behavior and arguments of `key-binding' and
David Kastrup <dak@gnu.org>
parents:
72806
diff
changeset
|
1852 if (!NILP (map)) |
25c755416160
* NEWS: explain new behavior and arguments of `key-binding' and
David Kastrup <dak@gnu.org>
parents:
72806
diff
changeset
|
1853 local_map = map; |
25c755416160
* NEWS: explain new behavior and arguments of `key-binding' and
David Kastrup <dak@gnu.org>
parents:
72806
diff
changeset
|
1854 |
25c755416160
* NEWS: explain new behavior and arguments of `key-binding' and
David Kastrup <dak@gnu.org>
parents:
72806
diff
changeset
|
1855 map = Fget_text_property (pos, Qkeymap, string); |
25c755416160
* NEWS: explain new behavior and arguments of `key-binding' and
David Kastrup <dak@gnu.org>
parents:
72806
diff
changeset
|
1856 if (!NILP (map)) |
25c755416160
* NEWS: explain new behavior and arguments of `key-binding' and
David Kastrup <dak@gnu.org>
parents:
72806
diff
changeset
|
1857 keymap = map; |
25c755416160
* NEWS: explain new behavior and arguments of `key-binding' and
David Kastrup <dak@gnu.org>
parents:
72806
diff
changeset
|
1858 } |
25c755416160
* NEWS: explain new behavior and arguments of `key-binding' and
David Kastrup <dak@gnu.org>
parents:
72806
diff
changeset
|
1859 } |
74574
3c809b430d91
(Flookup_key): Doc fix.
Juanma Barranquero <lekktu@gmail.com>
parents:
73350
diff
changeset
|
1860 |
72889
25c755416160
* NEWS: explain new behavior and arguments of `key-binding' and
David Kastrup <dak@gnu.org>
parents:
72806
diff
changeset
|
1861 } |
25c755416160
* NEWS: explain new behavior and arguments of `key-binding' and
David Kastrup <dak@gnu.org>
parents:
72806
diff
changeset
|
1862 |
25c755416160
* NEWS: explain new behavior and arguments of `key-binding' and
David Kastrup <dak@gnu.org>
parents:
72806
diff
changeset
|
1863 if (! NILP (keymap)) |
25c755416160
* NEWS: explain new behavior and arguments of `key-binding' and
David Kastrup <dak@gnu.org>
parents:
72806
diff
changeset
|
1864 { |
25c755416160
* NEWS: explain new behavior and arguments of `key-binding' and
David Kastrup <dak@gnu.org>
parents:
72806
diff
changeset
|
1865 value = Flookup_key (keymap, key, accept_default); |
42510
dde71e46eeeb
(Fcurrent_active_maps): Put the `keymap' property map first.
Richard M. Stallman <rms@gnu.org>
parents:
42404
diff
changeset
|
1866 if (! NILP (value) && !INTEGERP (value)) |
43152
0029b0259426
(Fdefine_key): Allow symbol as KEY argument for
Kim F. Storm <storm@cua.dk>
parents:
42510
diff
changeset
|
1867 goto done; |
42510
dde71e46eeeb
(Fcurrent_active_maps): Put the `keymap' property map first.
Richard M. Stallman <rms@gnu.org>
parents:
42404
diff
changeset
|
1868 } |
dde71e46eeeb
(Fcurrent_active_maps): Put the `keymap' property map first.
Richard M. Stallman <rms@gnu.org>
parents:
42404
diff
changeset
|
1869 |
5613
cad51b2de6cd
(Fkey_binding): Handle Voverriding_local_map.
Richard M. Stallman <rms@gnu.org>
parents:
5551
diff
changeset
|
1870 nmaps = current_minor_maps (0, &maps); |
7998
d4b5f4dd9c51
(Flookup_key): Add gcpro.
Richard M. Stallman <rms@gnu.org>
parents:
7894
diff
changeset
|
1871 /* Note that all these maps are GCPRO'd |
d4b5f4dd9c51
(Flookup_key): Add gcpro.
Richard M. Stallman <rms@gnu.org>
parents:
7894
diff
changeset
|
1872 in the places where we found them. */ |
d4b5f4dd9c51
(Flookup_key): Add gcpro.
Richard M. Stallman <rms@gnu.org>
parents:
7894
diff
changeset
|
1873 |
5613
cad51b2de6cd
(Fkey_binding): Handle Voverriding_local_map.
Richard M. Stallman <rms@gnu.org>
parents:
5551
diff
changeset
|
1874 for (i = 0; i < nmaps; i++) |
cad51b2de6cd
(Fkey_binding): Handle Voverriding_local_map.
Richard M. Stallman <rms@gnu.org>
parents:
5551
diff
changeset
|
1875 if (! NILP (maps[i])) |
cad51b2de6cd
(Fkey_binding): Handle Voverriding_local_map.
Richard M. Stallman <rms@gnu.org>
parents:
5551
diff
changeset
|
1876 { |
cad51b2de6cd
(Fkey_binding): Handle Voverriding_local_map.
Richard M. Stallman <rms@gnu.org>
parents:
5551
diff
changeset
|
1877 value = Flookup_key (maps[i], key, accept_default); |
9123
c225137ddefb
(get_keyelt, store_in_keymap, Fcopy_keymap, Fdefine_key, Flookup_key,
Karl Heuer <kwzh@gnu.org>
parents:
8922
diff
changeset
|
1878 if (! NILP (value) && !INTEGERP (value)) |
43152
0029b0259426
(Fdefine_key): Allow symbol as KEY argument for
Kim F. Storm <storm@cua.dk>
parents:
42510
diff
changeset
|
1879 goto done; |
5613
cad51b2de6cd
(Fkey_binding): Handle Voverriding_local_map.
Richard M. Stallman <rms@gnu.org>
parents:
5551
diff
changeset
|
1880 } |
cad51b2de6cd
(Fkey_binding): Handle Voverriding_local_map.
Richard M. Stallman <rms@gnu.org>
parents:
5551
diff
changeset
|
1881 |
72889
25c755416160
* NEWS: explain new behavior and arguments of `key-binding' and
David Kastrup <dak@gnu.org>
parents:
72806
diff
changeset
|
1882 if (! NILP (local_map)) |
5613
cad51b2de6cd
(Fkey_binding): Handle Voverriding_local_map.
Richard M. Stallman <rms@gnu.org>
parents:
5551
diff
changeset
|
1883 { |
72889
25c755416160
* NEWS: explain new behavior and arguments of `key-binding' and
David Kastrup <dak@gnu.org>
parents:
72806
diff
changeset
|
1884 value = Flookup_key (local_map, key, accept_default); |
9123
c225137ddefb
(get_keyelt, store_in_keymap, Fcopy_keymap, Fdefine_key, Flookup_key,
Karl Heuer <kwzh@gnu.org>
parents:
8922
diff
changeset
|
1885 if (! NILP (value) && !INTEGERP (value)) |
43152
0029b0259426
(Fdefine_key): Allow symbol as KEY argument for
Kim F. Storm <storm@cua.dk>
parents:
42510
diff
changeset
|
1886 goto done; |
5613
cad51b2de6cd
(Fkey_binding): Handle Voverriding_local_map.
Richard M. Stallman <rms@gnu.org>
parents:
5551
diff
changeset
|
1887 } |
cad51b2de6cd
(Fkey_binding): Handle Voverriding_local_map.
Richard M. Stallman <rms@gnu.org>
parents:
5551
diff
changeset
|
1888 } |
465 | 1889 |
1871
00bee181f7ed
* keymap.c (Flookup_key, Fkey_binding, Flocal_key_binding,
Jim Blandy <jimb@redhat.com>
parents:
1821
diff
changeset
|
1890 value = Flookup_key (current_global_map, key, accept_default); |
43152
0029b0259426
(Fdefine_key): Allow symbol as KEY argument for
Kim F. Storm <storm@cua.dk>
parents:
42510
diff
changeset
|
1891 |
0029b0259426
(Fdefine_key): Allow symbol as KEY argument for
Kim F. Storm <storm@cua.dk>
parents:
42510
diff
changeset
|
1892 done: |
72889
25c755416160
* NEWS: explain new behavior and arguments of `key-binding' and
David Kastrup <dak@gnu.org>
parents:
72806
diff
changeset
|
1893 unbind_to (count, Qnil); |
25c755416160
* NEWS: explain new behavior and arguments of `key-binding' and
David Kastrup <dak@gnu.org>
parents:
72806
diff
changeset
|
1894 |
7998
d4b5f4dd9c51
(Flookup_key): Add gcpro.
Richard M. Stallman <rms@gnu.org>
parents:
7894
diff
changeset
|
1895 UNGCPRO; |
43152
0029b0259426
(Fdefine_key): Allow symbol as KEY argument for
Kim F. Storm <storm@cua.dk>
parents:
42510
diff
changeset
|
1896 if (NILP (value) || INTEGERP (value)) |
0029b0259426
(Fdefine_key): Allow symbol as KEY argument for
Kim F. Storm <storm@cua.dk>
parents:
42510
diff
changeset
|
1897 return Qnil; |
0029b0259426
(Fdefine_key): Allow symbol as KEY argument for
Kim F. Storm <storm@cua.dk>
parents:
42510
diff
changeset
|
1898 |
0029b0259426
(Fdefine_key): Allow symbol as KEY argument for
Kim F. Storm <storm@cua.dk>
parents:
42510
diff
changeset
|
1899 /* If the result of the ordinary keymap lookup is an interactive |
0029b0259426
(Fdefine_key): Allow symbol as KEY argument for
Kim F. Storm <storm@cua.dk>
parents:
42510
diff
changeset
|
1900 command, look for a key binding (ie. remapping) for that command. */ |
45619
dbd65bd8bb4f
(describe_command): Cast `current_column' return value to int.
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
45404
diff
changeset
|
1901 |
43494
b5b76b498398
The following changes rework my patch of 2002-02-06 which
Kim F. Storm <storm@cua.dk>
parents:
43164
diff
changeset
|
1902 if (NILP (no_remap) && SYMBOLP (value)) |
43152
0029b0259426
(Fdefine_key): Allow symbol as KEY argument for
Kim F. Storm <storm@cua.dk>
parents:
42510
diff
changeset
|
1903 { |
0029b0259426
(Fdefine_key): Allow symbol as KEY argument for
Kim F. Storm <storm@cua.dk>
parents:
42510
diff
changeset
|
1904 Lisp_Object value1; |
76887
a5751af0b8a7
(Fcommand_remapping): New optional argument.
Chong Yidong <cyd@stupidchicken.com>
parents:
76862
diff
changeset
|
1905 if (value1 = Fcommand_remapping (value, position, Qnil), !NILP (value1)) |
43152
0029b0259426
(Fdefine_key): Allow symbol as KEY argument for
Kim F. Storm <storm@cua.dk>
parents:
42510
diff
changeset
|
1906 value = value1; |
0029b0259426
(Fdefine_key): Allow symbol as KEY argument for
Kim F. Storm <storm@cua.dk>
parents:
42510
diff
changeset
|
1907 } |
45619
dbd65bd8bb4f
(describe_command): Cast `current_column' return value to int.
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
45404
diff
changeset
|
1908 |
43152
0029b0259426
(Fdefine_key): Allow symbol as KEY argument for
Kim F. Storm <storm@cua.dk>
parents:
42510
diff
changeset
|
1909 return value; |
250 | 1910 } |
1911 | |
7998
d4b5f4dd9c51
(Flookup_key): Add gcpro.
Richard M. Stallman <rms@gnu.org>
parents:
7894
diff
changeset
|
1912 /* GC is possible in this function if it autoloads a keymap. */ |
d4b5f4dd9c51
(Flookup_key): Add gcpro.
Richard M. Stallman <rms@gnu.org>
parents:
7894
diff
changeset
|
1913 |
1871
00bee181f7ed
* keymap.c (Flookup_key, Fkey_binding, Flocal_key_binding,
Jim Blandy <jimb@redhat.com>
parents:
1821
diff
changeset
|
1914 DEFUN ("local-key-binding", Flocal_key_binding, Slocal_key_binding, 1, 2, 0, |
41001
a17c8b15ef1b
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
40804
diff
changeset
|
1915 doc: /* Return the binding for command KEYS in current local keymap only. |
56618
166ae6765a44
(Flocal_key_binding, Fglobal_key_binding)
Luc Teirlinck <teirllm@auburn.edu>
parents:
56574
diff
changeset
|
1916 KEYS is a string or vector, a sequence of keystrokes. |
41001
a17c8b15ef1b
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
40804
diff
changeset
|
1917 The binding is probably a symbol with a function definition. |
a17c8b15ef1b
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
40804
diff
changeset
|
1918 |
a17c8b15ef1b
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
40804
diff
changeset
|
1919 If optional argument ACCEPT-DEFAULT is non-nil, recognize default |
a17c8b15ef1b
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
40804
diff
changeset
|
1920 bindings; see the description of `lookup-key' for more details about this. */) |
109179
8cfee7d2955f
Convert DEFUNs to standard C.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
109165
diff
changeset
|
1921 (Lisp_Object keys, Lisp_Object accept_default) |
250 | 1922 { |
1923 register Lisp_Object map; | |
1924 map = current_buffer->keymap; | |
485 | 1925 if (NILP (map)) |
250 | 1926 return Qnil; |
1871
00bee181f7ed
* keymap.c (Flookup_key, Fkey_binding, Flocal_key_binding,
Jim Blandy <jimb@redhat.com>
parents:
1821
diff
changeset
|
1927 return Flookup_key (map, keys, accept_default); |
250 | 1928 } |
1929 | |
7998
d4b5f4dd9c51
(Flookup_key): Add gcpro.
Richard M. Stallman <rms@gnu.org>
parents:
7894
diff
changeset
|
1930 /* GC is possible in this function if it autoloads a keymap. */ |
d4b5f4dd9c51
(Flookup_key): Add gcpro.
Richard M. Stallman <rms@gnu.org>
parents:
7894
diff
changeset
|
1931 |
1871
00bee181f7ed
* keymap.c (Flookup_key, Fkey_binding, Flocal_key_binding,
Jim Blandy <jimb@redhat.com>
parents:
1821
diff
changeset
|
1932 DEFUN ("global-key-binding", Fglobal_key_binding, Sglobal_key_binding, 1, 2, 0, |
41001
a17c8b15ef1b
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
40804
diff
changeset
|
1933 doc: /* Return the binding for command KEYS in current global keymap only. |
56618
166ae6765a44
(Flocal_key_binding, Fglobal_key_binding)
Luc Teirlinck <teirllm@auburn.edu>
parents:
56574
diff
changeset
|
1934 KEYS is a string or vector, a sequence of keystrokes. |
41001
a17c8b15ef1b
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
40804
diff
changeset
|
1935 The binding is probably a symbol with a function definition. |
55913
c663e2e97168
(Fdescribe_vector): Fix docstring.
Juanma Barranquero <lekktu@gmail.com>
parents:
55722
diff
changeset
|
1936 This function's return values are the same as those of `lookup-key' |
41001
a17c8b15ef1b
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
40804
diff
changeset
|
1937 \(which see). |
a17c8b15ef1b
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
40804
diff
changeset
|
1938 |
a17c8b15ef1b
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
40804
diff
changeset
|
1939 If optional argument ACCEPT-DEFAULT is non-nil, recognize default |
a17c8b15ef1b
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
40804
diff
changeset
|
1940 bindings; see the description of `lookup-key' for more details about this. */) |
109179
8cfee7d2955f
Convert DEFUNs to standard C.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
109165
diff
changeset
|
1941 (Lisp_Object keys, Lisp_Object accept_default) |
250 | 1942 { |
1871
00bee181f7ed
* keymap.c (Flookup_key, Fkey_binding, Flocal_key_binding,
Jim Blandy <jimb@redhat.com>
parents:
1821
diff
changeset
|
1943 return Flookup_key (current_global_map, keys, accept_default); |
250 | 1944 } |
1945 | |
7998
d4b5f4dd9c51
(Flookup_key): Add gcpro.
Richard M. Stallman <rms@gnu.org>
parents:
7894
diff
changeset
|
1946 /* GC is possible in this function if it autoloads a keymap. */ |
d4b5f4dd9c51
(Flookup_key): Add gcpro.
Richard M. Stallman <rms@gnu.org>
parents:
7894
diff
changeset
|
1947 |
1871
00bee181f7ed
* keymap.c (Flookup_key, Fkey_binding, Flocal_key_binding,
Jim Blandy <jimb@redhat.com>
parents:
1821
diff
changeset
|
1948 DEFUN ("minor-mode-key-binding", Fminor_mode_key_binding, Sminor_mode_key_binding, 1, 2, 0, |
41001
a17c8b15ef1b
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
40804
diff
changeset
|
1949 doc: /* Find the visible minor mode bindings of KEY. |
64470
f9c745c0d949
(Fminor_mode_key_binding): Delete duplicate words.
Juri Linkov <juri@jurta.org>
parents:
64084
diff
changeset
|
1950 Return an alist of pairs (MODENAME . BINDING), where MODENAME is |
41001
a17c8b15ef1b
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
40804
diff
changeset
|
1951 the symbol which names the minor mode binding KEY, and BINDING is |
a17c8b15ef1b
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
40804
diff
changeset
|
1952 KEY's definition in that mode. In particular, if KEY has no |
a17c8b15ef1b
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
40804
diff
changeset
|
1953 minor-mode bindings, return nil. If the first binding is a |
a17c8b15ef1b
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
40804
diff
changeset
|
1954 non-prefix, all subsequent bindings will be omitted, since they would |
a17c8b15ef1b
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
40804
diff
changeset
|
1955 be ignored. Similarly, the list doesn't include non-prefix bindings |
a17c8b15ef1b
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
40804
diff
changeset
|
1956 that come after prefix bindings. |
a17c8b15ef1b
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
40804
diff
changeset
|
1957 |
a17c8b15ef1b
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
40804
diff
changeset
|
1958 If optional argument ACCEPT-DEFAULT is non-nil, recognize default |
a17c8b15ef1b
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
40804
diff
changeset
|
1959 bindings; see the description of `lookup-key' for more details about this. */) |
109179
8cfee7d2955f
Convert DEFUNs to standard C.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
109165
diff
changeset
|
1960 (Lisp_Object key, Lisp_Object accept_default) |
465 | 1961 { |
1962 Lisp_Object *modes, *maps; | |
1963 int nmaps; | |
1964 Lisp_Object binding; | |
1965 int i, j; | |
7998
d4b5f4dd9c51
(Flookup_key): Add gcpro.
Richard M. Stallman <rms@gnu.org>
parents:
7894
diff
changeset
|
1966 struct gcpro gcpro1, gcpro2; |
465 | 1967 |
1968 nmaps = current_minor_maps (&modes, &maps); | |
7998
d4b5f4dd9c51
(Flookup_key): Add gcpro.
Richard M. Stallman <rms@gnu.org>
parents:
7894
diff
changeset
|
1969 /* Note that all these maps are GCPRO'd |
d4b5f4dd9c51
(Flookup_key): Add gcpro.
Richard M. Stallman <rms@gnu.org>
parents:
7894
diff
changeset
|
1970 in the places where we found them. */ |
d4b5f4dd9c51
(Flookup_key): Add gcpro.
Richard M. Stallman <rms@gnu.org>
parents:
7894
diff
changeset
|
1971 |
d4b5f4dd9c51
(Flookup_key): Add gcpro.
Richard M. Stallman <rms@gnu.org>
parents:
7894
diff
changeset
|
1972 binding = Qnil; |
d4b5f4dd9c51
(Flookup_key): Add gcpro.
Richard M. Stallman <rms@gnu.org>
parents:
7894
diff
changeset
|
1973 GCPRO2 (key, binding); |
465 | 1974 |
1975 for (i = j = 0; i < nmaps; i++) | |
32988
c3435dc00ed7
* lisp.h (KEYMAPP): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
32889
diff
changeset
|
1976 if (!NILP (maps[i]) |
c3435dc00ed7
* lisp.h (KEYMAPP): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
32889
diff
changeset
|
1977 && !NILP (binding = Flookup_key (maps[i], key, accept_default)) |
9123
c225137ddefb
(get_keyelt, store_in_keymap, Fcopy_keymap, Fdefine_key, Flookup_key,
Karl Heuer <kwzh@gnu.org>
parents:
8922
diff
changeset
|
1978 && !INTEGERP (binding)) |
465 | 1979 { |
32988
c3435dc00ed7
* lisp.h (KEYMAPP): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
32889
diff
changeset
|
1980 if (KEYMAPP (binding)) |
465 | 1981 maps[j++] = Fcons (modes[i], binding); |
1982 else if (j == 0) | |
7998
d4b5f4dd9c51
(Flookup_key): Add gcpro.
Richard M. Stallman <rms@gnu.org>
parents:
7894
diff
changeset
|
1983 RETURN_UNGCPRO (Fcons (Fcons (modes[i], binding), Qnil)); |
465 | 1984 } |
1985 | |
7998
d4b5f4dd9c51
(Flookup_key): Add gcpro.
Richard M. Stallman <rms@gnu.org>
parents:
7894
diff
changeset
|
1986 UNGCPRO; |
465 | 1987 return Flist (j, maps); |
1988 } | |
1989 | |
23968
4c423f69142b
(Fdefine_prefix_command): Accept a third argument NAME
Eli Zaretskii <eliz@gnu.org>
parents:
23953
diff
changeset
|
1990 DEFUN ("define-prefix-command", Fdefine_prefix_command, Sdefine_prefix_command, 1, 3, 0, |
41001
a17c8b15ef1b
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
40804
diff
changeset
|
1991 doc: /* Define COMMAND as a prefix command. COMMAND should be a symbol. |
a17c8b15ef1b
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
40804
diff
changeset
|
1992 A new sparse keymap is stored as COMMAND's function definition and its value. |
a17c8b15ef1b
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
40804
diff
changeset
|
1993 If a second optional argument MAPVAR is given, the map is stored as |
a17c8b15ef1b
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
40804
diff
changeset
|
1994 its value instead of as COMMAND's value; but COMMAND is still defined |
a17c8b15ef1b
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
40804
diff
changeset
|
1995 as a function. |
a17c8b15ef1b
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
40804
diff
changeset
|
1996 The third optional argument NAME, if given, supplies a menu name |
56573
b5575b1c51f0
(Fset_keymap_parent, Fdefine_prefix_command): Doc fixes.
Luc Teirlinck <teirllm@auburn.edu>
parents:
56217
diff
changeset
|
1997 string for the map. This is required to use the keymap as a menu. |
b5575b1c51f0
(Fset_keymap_parent, Fdefine_prefix_command): Doc fixes.
Luc Teirlinck <teirllm@auburn.edu>
parents:
56217
diff
changeset
|
1998 This function returns COMMAND. */) |
109179
8cfee7d2955f
Convert DEFUNs to standard C.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
109165
diff
changeset
|
1999 (Lisp_Object command, Lisp_Object mapvar, Lisp_Object name) |
250 | 2000 { |
2001 Lisp_Object map; | |
23968
4c423f69142b
(Fdefine_prefix_command): Accept a third argument NAME
Eli Zaretskii <eliz@gnu.org>
parents:
23953
diff
changeset
|
2002 map = Fmake_sparse_keymap (name); |
14080
439185f0ef37
(Fkeymapp, Fdefine_prefix_command, Faccessible_keymaps,
Erik Naggum <erik@naggum.no>
parents:
13947
diff
changeset
|
2003 Ffset (command, map); |
485 | 2004 if (!NILP (mapvar)) |
250 | 2005 Fset (mapvar, map); |
2006 else | |
14080
439185f0ef37
(Fkeymapp, Fdefine_prefix_command, Faccessible_keymaps,
Erik Naggum <erik@naggum.no>
parents:
13947
diff
changeset
|
2007 Fset (command, map); |
439185f0ef37
(Fkeymapp, Fdefine_prefix_command, Faccessible_keymaps,
Erik Naggum <erik@naggum.no>
parents:
13947
diff
changeset
|
2008 return command; |
250 | 2009 } |
2010 | |
2011 DEFUN ("use-global-map", Fuse_global_map, Suse_global_map, 1, 1, 0, | |
41001
a17c8b15ef1b
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
40804
diff
changeset
|
2012 doc: /* Select KEYMAP as the global keymap. */) |
109179
8cfee7d2955f
Convert DEFUNs to standard C.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
109165
diff
changeset
|
2013 (Lisp_Object keymap) |
250 | 2014 { |
32988
c3435dc00ed7
* lisp.h (KEYMAPP): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
32889
diff
changeset
|
2015 keymap = get_keymap (keymap, 1, 1); |
250 | 2016 current_global_map = keymap; |
8464
edbb014c600a
(Fuse_global_map, Fuse_local_map): Call record_asynch_buffer_change.
Richard M. Stallman <rms@gnu.org>
parents:
8431
diff
changeset
|
2017 |
250 | 2018 return Qnil; |
2019 } | |
2020 | |
2021 DEFUN ("use-local-map", Fuse_local_map, Suse_local_map, 1, 1, 0, | |
41001
a17c8b15ef1b
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
40804
diff
changeset
|
2022 doc: /* Select KEYMAP as the local keymap. |
a17c8b15ef1b
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
40804
diff
changeset
|
2023 If KEYMAP is nil, that means no local keymap. */) |
109179
8cfee7d2955f
Convert DEFUNs to standard C.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
109165
diff
changeset
|
2024 (Lisp_Object keymap) |
250 | 2025 { |
485 | 2026 if (!NILP (keymap)) |
32988
c3435dc00ed7
* lisp.h (KEYMAPP): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
32889
diff
changeset
|
2027 keymap = get_keymap (keymap, 1, 1); |
250 | 2028 |
2029 current_buffer->keymap = keymap; | |
2030 | |
2031 return Qnil; | |
2032 } | |
2033 | |
2034 DEFUN ("current-local-map", Fcurrent_local_map, Scurrent_local_map, 0, 0, 0, | |
86808
3386f3b8a58f
(Fcurrent_local_map): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
86331
diff
changeset
|
2035 doc: /* Return current buffer's local keymap, or nil if it has none. |
3386f3b8a58f
(Fcurrent_local_map): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
86331
diff
changeset
|
2036 Normally the local keymap is set by the major mode with `use-local-map'. */) |
109179
8cfee7d2955f
Convert DEFUNs to standard C.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
109165
diff
changeset
|
2037 (void) |
250 | 2038 { |
2039 return current_buffer->keymap; | |
2040 } | |
2041 | |
2042 DEFUN ("current-global-map", Fcurrent_global_map, Scurrent_global_map, 0, 0, 0, | |
41001
a17c8b15ef1b
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
40804
diff
changeset
|
2043 doc: /* Return the current global keymap. */) |
109179
8cfee7d2955f
Convert DEFUNs to standard C.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
109165
diff
changeset
|
2044 (void) |
250 | 2045 { |
2046 return current_global_map; | |
2047 } | |
465 | 2048 |
2049 DEFUN ("current-minor-mode-maps", Fcurrent_minor_mode_maps, Scurrent_minor_mode_maps, 0, 0, 0, | |
41001
a17c8b15ef1b
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
40804
diff
changeset
|
2050 doc: /* Return a list of keymaps for the minor modes of the current buffer. */) |
109179
8cfee7d2955f
Convert DEFUNs to standard C.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
109165
diff
changeset
|
2051 (void) |
465 | 2052 { |
2053 Lisp_Object *maps; | |
2054 int nmaps = current_minor_maps (0, &maps); | |
2055 | |
2056 return Flist (nmaps, maps); | |
2057 } | |
250 | 2058 |
465 | 2059 /* Help functions for describing and documenting keymaps. */ |
2060 | |
81792
4ee4f467ca51
(struct accessible_keymaps_data, struct where_is_internal_data): New structs.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
81609
diff
changeset
|
2061 struct accessible_keymaps_data { |
4ee4f467ca51
(struct accessible_keymaps_data, struct where_is_internal_data): New structs.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
81609
diff
changeset
|
2062 Lisp_Object maps, tail, thisseq; |
4ee4f467ca51
(struct accessible_keymaps_data, struct where_is_internal_data): New structs.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
81609
diff
changeset
|
2063 /* Does the current sequence end in the meta-prefix-char? */ |
4ee4f467ca51
(struct accessible_keymaps_data, struct where_is_internal_data): New structs.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
81609
diff
changeset
|
2064 int is_metized; |
4ee4f467ca51
(struct accessible_keymaps_data, struct where_is_internal_data): New structs.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
81609
diff
changeset
|
2065 }; |
39689
0572449a62be
(Fkeymap_prompt, Fcurrent_active_maps): New funs.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
39682
diff
changeset
|
2066 |
0572449a62be
(Fkeymap_prompt, Fcurrent_active_maps): New funs.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
39682
diff
changeset
|
2067 static void |
109126
aec1143e8d85
Convert (most) functions in src to standard C.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
109100
diff
changeset
|
2068 accessible_keymaps_1 (Lisp_Object key, Lisp_Object cmd, Lisp_Object args, void *data) |
109131
18f8e88d3829
Fix comments and whitespace.
Juanma Barranquero <lekktu@gmail.com>
parents:
109126
diff
changeset
|
2069 /* Use void* data to be compatible with map_keymap_function_t. */ |
39689
0572449a62be
(Fkeymap_prompt, Fcurrent_active_maps): New funs.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
39682
diff
changeset
|
2070 { |
81792
4ee4f467ca51
(struct accessible_keymaps_data, struct where_is_internal_data): New structs.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
81609
diff
changeset
|
2071 struct accessible_keymaps_data *d = data; /* Cast! */ |
4ee4f467ca51
(struct accessible_keymaps_data, struct where_is_internal_data): New structs.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
81609
diff
changeset
|
2072 Lisp_Object maps = d->maps; |
4ee4f467ca51
(struct accessible_keymaps_data, struct where_is_internal_data): New structs.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
81609
diff
changeset
|
2073 Lisp_Object tail = d->tail; |
4ee4f467ca51
(struct accessible_keymaps_data, struct where_is_internal_data): New structs.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
81609
diff
changeset
|
2074 Lisp_Object thisseq = d->thisseq; |
4ee4f467ca51
(struct accessible_keymaps_data, struct where_is_internal_data): New structs.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
81609
diff
changeset
|
2075 int is_metized = d->is_metized && INTEGERP (key); |
39689
0572449a62be
(Fkeymap_prompt, Fcurrent_active_maps): New funs.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
39682
diff
changeset
|
2076 Lisp_Object tem; |
0572449a62be
(Fkeymap_prompt, Fcurrent_active_maps): New funs.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
39682
diff
changeset
|
2077 |
50189
c7ce12a3b9c2
(accessible_keymaps_1): Break cycles but without preventing
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
50141
diff
changeset
|
2078 cmd = get_keymap (get_keyelt (cmd, 0), 0, 0); |
39689
0572449a62be
(Fkeymap_prompt, Fcurrent_active_maps): New funs.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
39682
diff
changeset
|
2079 if (NILP (cmd)) |
0572449a62be
(Fkeymap_prompt, Fcurrent_active_maps): New funs.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
39682
diff
changeset
|
2080 return; |
0572449a62be
(Fkeymap_prompt, Fcurrent_active_maps): New funs.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
39682
diff
changeset
|
2081 |
50189
c7ce12a3b9c2
(accessible_keymaps_1): Break cycles but without preventing
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
50141
diff
changeset
|
2082 /* Look for and break cycles. */ |
c7ce12a3b9c2
(accessible_keymaps_1): Break cycles but without preventing
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
50141
diff
changeset
|
2083 while (!NILP (tem = Frassq (cmd, maps))) |
39689
0572449a62be
(Fkeymap_prompt, Fcurrent_active_maps): New funs.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
39682
diff
changeset
|
2084 { |
50189
c7ce12a3b9c2
(accessible_keymaps_1): Break cycles but without preventing
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
50141
diff
changeset
|
2085 Lisp_Object prefix = XCAR (tem); |
c7ce12a3b9c2
(accessible_keymaps_1): Break cycles but without preventing
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
50141
diff
changeset
|
2086 int lim = XINT (Flength (XCAR (tem))); |
c7ce12a3b9c2
(accessible_keymaps_1): Break cycles but without preventing
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
50141
diff
changeset
|
2087 if (lim <= XINT (Flength (thisseq))) |
c7ce12a3b9c2
(accessible_keymaps_1): Break cycles but without preventing
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
50141
diff
changeset
|
2088 { /* This keymap was already seen with a smaller prefix. */ |
c7ce12a3b9c2
(accessible_keymaps_1): Break cycles but without preventing
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
50141
diff
changeset
|
2089 int i = 0; |
c7ce12a3b9c2
(accessible_keymaps_1): Break cycles but without preventing
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
50141
diff
changeset
|
2090 while (i < lim && EQ (Faref (prefix, make_number (i)), |
c7ce12a3b9c2
(accessible_keymaps_1): Break cycles but without preventing
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
50141
diff
changeset
|
2091 Faref (thisseq, make_number (i)))) |
c7ce12a3b9c2
(accessible_keymaps_1): Break cycles but without preventing
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
50141
diff
changeset
|
2092 i++; |
c7ce12a3b9c2
(accessible_keymaps_1): Break cycles but without preventing
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
50141
diff
changeset
|
2093 if (i >= lim) |
c7ce12a3b9c2
(accessible_keymaps_1): Break cycles but without preventing
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
50141
diff
changeset
|
2094 /* `prefix' is a prefix of `thisseq' => there's a cycle. */ |
c7ce12a3b9c2
(accessible_keymaps_1): Break cycles but without preventing
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
50141
diff
changeset
|
2095 return; |
39689
0572449a62be
(Fkeymap_prompt, Fcurrent_active_maps): New funs.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
39682
diff
changeset
|
2096 } |
50189
c7ce12a3b9c2
(accessible_keymaps_1): Break cycles but without preventing
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
50141
diff
changeset
|
2097 /* This occurrence of `cmd' in `maps' does not correspond to a cycle, |
c7ce12a3b9c2
(accessible_keymaps_1): Break cycles but without preventing
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
50141
diff
changeset
|
2098 but maybe `cmd' occurs again further down in `maps', so keep |
c7ce12a3b9c2
(accessible_keymaps_1): Break cycles but without preventing
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
50141
diff
changeset
|
2099 looking. */ |
c7ce12a3b9c2
(accessible_keymaps_1): Break cycles but without preventing
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
50141
diff
changeset
|
2100 maps = XCDR (Fmemq (tem, maps)); |
c7ce12a3b9c2
(accessible_keymaps_1): Break cycles but without preventing
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
50141
diff
changeset
|
2101 } |
c7ce12a3b9c2
(accessible_keymaps_1): Break cycles but without preventing
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
50141
diff
changeset
|
2102 |
c7ce12a3b9c2
(accessible_keymaps_1): Break cycles but without preventing
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
50141
diff
changeset
|
2103 /* If the last key in thisseq is meta-prefix-char, |
c7ce12a3b9c2
(accessible_keymaps_1): Break cycles but without preventing
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
50141
diff
changeset
|
2104 turn it into a meta-ized keystroke. We know |
c7ce12a3b9c2
(accessible_keymaps_1): Break cycles but without preventing
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
50141
diff
changeset
|
2105 that the event we're about to append is an |
c7ce12a3b9c2
(accessible_keymaps_1): Break cycles but without preventing
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
50141
diff
changeset
|
2106 ascii keystroke since we're processing a |
c7ce12a3b9c2
(accessible_keymaps_1): Break cycles but without preventing
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
50141
diff
changeset
|
2107 keymap table. */ |
c7ce12a3b9c2
(accessible_keymaps_1): Break cycles but without preventing
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
50141
diff
changeset
|
2108 if (is_metized) |
c7ce12a3b9c2
(accessible_keymaps_1): Break cycles but without preventing
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
50141
diff
changeset
|
2109 { |
c7ce12a3b9c2
(accessible_keymaps_1): Break cycles but without preventing
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
50141
diff
changeset
|
2110 int meta_bit = meta_modifier; |
c7ce12a3b9c2
(accessible_keymaps_1): Break cycles but without preventing
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
50141
diff
changeset
|
2111 Lisp_Object last = make_number (XINT (Flength (thisseq)) - 1); |
c7ce12a3b9c2
(accessible_keymaps_1): Break cycles but without preventing
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
50141
diff
changeset
|
2112 tem = Fcopy_sequence (thisseq); |
54925
f0a7441d22f6
(Fkey_description): Add optional PREFIX arg.
Kim F. Storm <storm@cua.dk>
parents:
53808
diff
changeset
|
2113 |
50189
c7ce12a3b9c2
(accessible_keymaps_1): Break cycles but without preventing
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
50141
diff
changeset
|
2114 Faset (tem, last, make_number (XINT (key) | meta_bit)); |
54925
f0a7441d22f6
(Fkey_description): Add optional PREFIX arg.
Kim F. Storm <storm@cua.dk>
parents:
53808
diff
changeset
|
2115 |
50189
c7ce12a3b9c2
(accessible_keymaps_1): Break cycles but without preventing
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
50141
diff
changeset
|
2116 /* This new sequence is the same length as |
c7ce12a3b9c2
(accessible_keymaps_1): Break cycles but without preventing
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
50141
diff
changeset
|
2117 thisseq, so stick it in the list right |
c7ce12a3b9c2
(accessible_keymaps_1): Break cycles but without preventing
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
50141
diff
changeset
|
2118 after this one. */ |
c7ce12a3b9c2
(accessible_keymaps_1): Break cycles but without preventing
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
50141
diff
changeset
|
2119 XSETCDR (tail, |
c7ce12a3b9c2
(accessible_keymaps_1): Break cycles but without preventing
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
50141
diff
changeset
|
2120 Fcons (Fcons (tem, cmd), XCDR (tail))); |
c7ce12a3b9c2
(accessible_keymaps_1): Break cycles but without preventing
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
50141
diff
changeset
|
2121 } |
c7ce12a3b9c2
(accessible_keymaps_1): Break cycles but without preventing
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
50141
diff
changeset
|
2122 else |
c7ce12a3b9c2
(accessible_keymaps_1): Break cycles but without preventing
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
50141
diff
changeset
|
2123 { |
c7ce12a3b9c2
(accessible_keymaps_1): Break cycles but without preventing
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
50141
diff
changeset
|
2124 tem = append_key (thisseq, key); |
c7ce12a3b9c2
(accessible_keymaps_1): Break cycles but without preventing
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
50141
diff
changeset
|
2125 nconc2 (tail, Fcons (Fcons (tem, cmd), Qnil)); |
39689
0572449a62be
(Fkeymap_prompt, Fcurrent_active_maps): New funs.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
39682
diff
changeset
|
2126 } |
0572449a62be
(Fkeymap_prompt, Fcurrent_active_maps): New funs.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
39682
diff
changeset
|
2127 } |
0572449a62be
(Fkeymap_prompt, Fcurrent_active_maps): New funs.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
39682
diff
changeset
|
2128 |
7998
d4b5f4dd9c51
(Flookup_key): Add gcpro.
Richard M. Stallman <rms@gnu.org>
parents:
7894
diff
changeset
|
2129 /* This function cannot GC. */ |
d4b5f4dd9c51
(Flookup_key): Add gcpro.
Richard M. Stallman <rms@gnu.org>
parents:
7894
diff
changeset
|
2130 |
250 | 2131 DEFUN ("accessible-keymaps", Faccessible_keymaps, Saccessible_keymaps, |
41001
a17c8b15ef1b
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
40804
diff
changeset
|
2132 1, 2, 0, |
a17c8b15ef1b
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
40804
diff
changeset
|
2133 doc: /* Find all keymaps accessible via prefix characters from KEYMAP. |
a17c8b15ef1b
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
40804
diff
changeset
|
2134 Returns a list of elements of the form (KEYS . MAP), where the sequence |
a17c8b15ef1b
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
40804
diff
changeset
|
2135 KEYS starting from KEYMAP gets you to MAP. These elements are ordered |
a17c8b15ef1b
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
40804
diff
changeset
|
2136 so that the KEYS increase in length. The first element is ([] . KEYMAP). |
a17c8b15ef1b
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
40804
diff
changeset
|
2137 An optional argument PREFIX, if non-nil, should be a key sequence; |
a17c8b15ef1b
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
40804
diff
changeset
|
2138 then the value includes only maps for prefixes that start with PREFIX. */) |
109179
8cfee7d2955f
Convert DEFUNs to standard C.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
109165
diff
changeset
|
2139 (Lisp_Object keymap, Lisp_Object prefix) |
250 | 2140 { |
50190
615d7388f725
(Faccessible_keymaps): Remove unused var.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
50189
diff
changeset
|
2141 Lisp_Object maps, tail; |
81792
4ee4f467ca51
(struct accessible_keymaps_data, struct where_is_internal_data): New structs.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
81609
diff
changeset
|
2142 int prefixlen = XINT (Flength (prefix)); |
3952
f9dfc2872fb0
(describe_map_tree): Insert key_heading here.
Richard M. Stallman <rms@gnu.org>
parents:
3908
diff
changeset
|
2143 |
7998
d4b5f4dd9c51
(Flookup_key): Add gcpro.
Richard M. Stallman <rms@gnu.org>
parents:
7894
diff
changeset
|
2144 /* no need for gcpro because we don't autoload any keymaps. */ |
d4b5f4dd9c51
(Flookup_key): Add gcpro.
Richard M. Stallman <rms@gnu.org>
parents:
7894
diff
changeset
|
2145 |
3952
f9dfc2872fb0
(describe_map_tree): Insert key_heading here.
Richard M. Stallman <rms@gnu.org>
parents:
3908
diff
changeset
|
2146 if (!NILP (prefix)) |
8431
b4138573c00f
(Faccessible_keymaps): Use PREFIX to set loop starting
Richard M. Stallman <rms@gnu.org>
parents:
7998
diff
changeset
|
2147 { |
b4138573c00f
(Faccessible_keymaps): Use PREFIX to set loop starting
Richard M. Stallman <rms@gnu.org>
parents:
7998
diff
changeset
|
2148 /* If a prefix was specified, start with the keymap (if any) for |
b4138573c00f
(Faccessible_keymaps): Use PREFIX to set loop starting
Richard M. Stallman <rms@gnu.org>
parents:
7998
diff
changeset
|
2149 that prefix, so we don't waste time considering other prefixes. */ |
b4138573c00f
(Faccessible_keymaps): Use PREFIX to set loop starting
Richard M. Stallman <rms@gnu.org>
parents:
7998
diff
changeset
|
2150 Lisp_Object tem; |
14080
439185f0ef37
(Fkeymapp, Fdefine_prefix_command, Faccessible_keymaps,
Erik Naggum <erik@naggum.no>
parents:
13947
diff
changeset
|
2151 tem = Flookup_key (keymap, prefix, Qt); |
8473
c285c3b0ea54
(Faccessible_keymaps): Fix previous change.
Richard M. Stallman <rms@gnu.org>
parents:
8464
diff
changeset
|
2152 /* Flookup_key may give us nil, or a number, |
c285c3b0ea54
(Faccessible_keymaps): Fix previous change.
Richard M. Stallman <rms@gnu.org>
parents:
8464
diff
changeset
|
2153 if the prefix is not defined in this particular map. |
c285c3b0ea54
(Faccessible_keymaps): Fix previous change.
Richard M. Stallman <rms@gnu.org>
parents:
8464
diff
changeset
|
2154 It might even give us a list that isn't a keymap. */ |
32988
c3435dc00ed7
* lisp.h (KEYMAPP): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
32889
diff
changeset
|
2155 tem = get_keymap (tem, 0, 0); |
81792
4ee4f467ca51
(struct accessible_keymaps_data, struct where_is_internal_data): New structs.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
81609
diff
changeset
|
2156 /* If the keymap is autoloaded `tem' is not a cons-cell, but we still |
4ee4f467ca51
(struct accessible_keymaps_data, struct where_is_internal_data): New structs.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
81609
diff
changeset
|
2157 want to return it. */ |
4ee4f467ca51
(struct accessible_keymaps_data, struct where_is_internal_data): New structs.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
81609
diff
changeset
|
2158 if (!NILP (tem)) |
17510
2da99276d613
(Faccessible_keymaps): Convert PREFIX to a vector
Richard M. Stallman <rms@gnu.org>
parents:
17327
diff
changeset
|
2159 { |
2da99276d613
(Faccessible_keymaps): Convert PREFIX to a vector
Richard M. Stallman <rms@gnu.org>
parents:
17327
diff
changeset
|
2160 /* Convert PREFIX to a vector now, so that later on |
2da99276d613
(Faccessible_keymaps): Convert PREFIX to a vector
Richard M. Stallman <rms@gnu.org>
parents:
17327
diff
changeset
|
2161 we don't have to deal with the possibility of a string. */ |
2da99276d613
(Faccessible_keymaps): Convert PREFIX to a vector
Richard M. Stallman <rms@gnu.org>
parents:
17327
diff
changeset
|
2162 if (STRINGP (prefix)) |
2da99276d613
(Faccessible_keymaps): Convert PREFIX to a vector
Richard M. Stallman <rms@gnu.org>
parents:
17327
diff
changeset
|
2163 { |
20624
9ac0b485cf60
(describe_vector): Unconditionally handle multibyte chars.
Richard M. Stallman <rms@gnu.org>
parents:
20576
diff
changeset
|
2164 int i, i_byte, c; |
17510
2da99276d613
(Faccessible_keymaps): Convert PREFIX to a vector
Richard M. Stallman <rms@gnu.org>
parents:
17327
diff
changeset
|
2165 Lisp_Object copy; |
2da99276d613
(Faccessible_keymaps): Convert PREFIX to a vector
Richard M. Stallman <rms@gnu.org>
parents:
17327
diff
changeset
|
2166 |
46370
40db0673e6f0
Most uses of XSTRING combined with STRING_BYTES or indirection changed to
Ken Raeburn <raeburn@raeburn.org>
parents:
46310
diff
changeset
|
2167 copy = Fmake_vector (make_number (SCHARS (prefix)), Qnil); |
40db0673e6f0
Most uses of XSTRING combined with STRING_BYTES or indirection changed to
Ken Raeburn <raeburn@raeburn.org>
parents:
46310
diff
changeset
|
2168 for (i = 0, i_byte = 0; i < SCHARS (prefix);) |
17510
2da99276d613
(Faccessible_keymaps): Convert PREFIX to a vector
Richard M. Stallman <rms@gnu.org>
parents:
17327
diff
changeset
|
2169 { |
20624
9ac0b485cf60
(describe_vector): Unconditionally handle multibyte chars.
Richard M. Stallman <rms@gnu.org>
parents:
20576
diff
changeset
|
2170 int i_before = i; |
29013
b9565b4bcdf8
(Fsingle_key_description): Use SPLIT_CHAR instead of
Kenichi Handa <handa@m17n.org>
parents:
26864
diff
changeset
|
2171 |
b9565b4bcdf8
(Fsingle_key_description): Use SPLIT_CHAR instead of
Kenichi Handa <handa@m17n.org>
parents:
26864
diff
changeset
|
2172 FETCH_STRING_CHAR_ADVANCE (c, prefix, i, i_byte); |
b9565b4bcdf8
(Fsingle_key_description): Use SPLIT_CHAR instead of
Kenichi Handa <handa@m17n.org>
parents:
26864
diff
changeset
|
2173 if (SINGLE_BYTE_CHAR_P (c) && (c & 0200)) |
b9565b4bcdf8
(Fsingle_key_description): Use SPLIT_CHAR instead of
Kenichi Handa <handa@m17n.org>
parents:
26864
diff
changeset
|
2174 c ^= 0200 | meta_modifier; |
32846
c1b3ab2a1ccc
Use AREF, ASET and ASIZE macros.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
32844
diff
changeset
|
2175 ASET (copy, i_before, make_number (c)); |
17510
2da99276d613
(Faccessible_keymaps): Convert PREFIX to a vector
Richard M. Stallman <rms@gnu.org>
parents:
17327
diff
changeset
|
2176 } |
2da99276d613
(Faccessible_keymaps): Convert PREFIX to a vector
Richard M. Stallman <rms@gnu.org>
parents:
17327
diff
changeset
|
2177 prefix = copy; |
2da99276d613
(Faccessible_keymaps): Convert PREFIX to a vector
Richard M. Stallman <rms@gnu.org>
parents:
17327
diff
changeset
|
2178 } |
2da99276d613
(Faccessible_keymaps): Convert PREFIX to a vector
Richard M. Stallman <rms@gnu.org>
parents:
17327
diff
changeset
|
2179 maps = Fcons (Fcons (prefix, tem), Qnil); |
2da99276d613
(Faccessible_keymaps): Convert PREFIX to a vector
Richard M. Stallman <rms@gnu.org>
parents:
17327
diff
changeset
|
2180 } |
8431
b4138573c00f
(Faccessible_keymaps): Use PREFIX to set loop starting
Richard M. Stallman <rms@gnu.org>
parents:
7998
diff
changeset
|
2181 else |
b4138573c00f
(Faccessible_keymaps): Use PREFIX to set loop starting
Richard M. Stallman <rms@gnu.org>
parents:
7998
diff
changeset
|
2182 return Qnil; |
b4138573c00f
(Faccessible_keymaps): Use PREFIX to set loop starting
Richard M. Stallman <rms@gnu.org>
parents:
7998
diff
changeset
|
2183 } |
b4138573c00f
(Faccessible_keymaps): Use PREFIX to set loop starting
Richard M. Stallman <rms@gnu.org>
parents:
7998
diff
changeset
|
2184 else |
b4138573c00f
(Faccessible_keymaps): Use PREFIX to set loop starting
Richard M. Stallman <rms@gnu.org>
parents:
7998
diff
changeset
|
2185 maps = Fcons (Fcons (Fmake_vector (make_number (0), Qnil), |
32988
c3435dc00ed7
* lisp.h (KEYMAPP): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
32889
diff
changeset
|
2186 get_keymap (keymap, 1, 0)), |
8431
b4138573c00f
(Faccessible_keymaps): Use PREFIX to set loop starting
Richard M. Stallman <rms@gnu.org>
parents:
7998
diff
changeset
|
2187 Qnil); |
250 | 2188 |
2189 /* For each map in the list maps, | |
2190 look at any other maps it points to, | |
2191 and stick them at the end if they are not already in the list. | |
2192 | |
2193 This is a breadth-first traversal, where tail is the queue of | |
2194 nodes, and maps accumulates a list of all nodes visited. */ | |
2195 | |
25662
0a7261c1d487
Use XCAR, XCDR, and XFLOAT_DATA instead of explicit member access.
Ken Raeburn <raeburn@raeburn.org>
parents:
25600
diff
changeset
|
2196 for (tail = maps; CONSP (tail); tail = XCDR (tail)) |
250 | 2197 { |
81792
4ee4f467ca51
(struct accessible_keymaps_data, struct where_is_internal_data): New structs.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
81609
diff
changeset
|
2198 struct accessible_keymaps_data data; |
4ee4f467ca51
(struct accessible_keymaps_data, struct where_is_internal_data): New structs.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
81609
diff
changeset
|
2199 register Lisp_Object thismap = Fcdr (XCAR (tail)); |
6502
18dfda644bc0
(access_keymap, store_in_keymap, Fcopy_keymap, Fdefine_key,
Karl Heuer <kwzh@gnu.org>
parents:
6475
diff
changeset
|
2200 Lisp_Object last; |
81792
4ee4f467ca51
(struct accessible_keymaps_data, struct where_is_internal_data): New structs.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
81609
diff
changeset
|
2201 |
4ee4f467ca51
(struct accessible_keymaps_data, struct where_is_internal_data): New structs.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
81609
diff
changeset
|
2202 data.thisseq = Fcar (XCAR (tail)); |
4ee4f467ca51
(struct accessible_keymaps_data, struct where_is_internal_data): New structs.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
81609
diff
changeset
|
2203 data.maps = maps; |
4ee4f467ca51
(struct accessible_keymaps_data, struct where_is_internal_data): New structs.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
81609
diff
changeset
|
2204 data.tail = tail; |
4ee4f467ca51
(struct accessible_keymaps_data, struct where_is_internal_data): New structs.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
81609
diff
changeset
|
2205 last = make_number (XINT (Flength (data.thisseq)) - 1); |
6502
18dfda644bc0
(access_keymap, store_in_keymap, Fcopy_keymap, Fdefine_key,
Karl Heuer <kwzh@gnu.org>
parents:
6475
diff
changeset
|
2206 /* Does the current sequence end in the meta-prefix-char? */ |
81792
4ee4f467ca51
(struct accessible_keymaps_data, struct where_is_internal_data): New structs.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
81609
diff
changeset
|
2207 data.is_metized = (XINT (last) >= 0 |
17264
fad065a280dc
(Faccessible_keymaps): When metizing, convert a
Richard M. Stallman <rms@gnu.org>
parents:
17189
diff
changeset
|
2208 /* Don't metize the last char of PREFIX. */ |
fad065a280dc
(Faccessible_keymaps): When metizing, convert a
Richard M. Stallman <rms@gnu.org>
parents:
17189
diff
changeset
|
2209 && XINT (last) >= prefixlen |
81792
4ee4f467ca51
(struct accessible_keymaps_data, struct where_is_internal_data): New structs.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
81609
diff
changeset
|
2210 && EQ (Faref (data.thisseq, last), meta_prefix_char)); |
4ee4f467ca51
(struct accessible_keymaps_data, struct where_is_internal_data): New structs.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
81609
diff
changeset
|
2211 |
4ee4f467ca51
(struct accessible_keymaps_data, struct where_is_internal_data): New structs.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
81609
diff
changeset
|
2212 /* Since we can't run lisp code, we can't scan autoloaded maps. */ |
4ee4f467ca51
(struct accessible_keymaps_data, struct where_is_internal_data): New structs.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
81609
diff
changeset
|
2213 if (CONSP (thismap)) |
4ee4f467ca51
(struct accessible_keymaps_data, struct where_is_internal_data): New structs.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
81609
diff
changeset
|
2214 map_keymap (thismap, accessible_keymaps_1, Qnil, &data, 0); |
250 | 2215 } |
50189
c7ce12a3b9c2
(accessible_keymaps_1): Break cycles but without preventing
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
50141
diff
changeset
|
2216 return maps; |
250 | 2217 } |
2218 Lisp_Object Qsingle_key_description, Qkey_description; | |
2219 | |
7998
d4b5f4dd9c51
(Flookup_key): Add gcpro.
Richard M. Stallman <rms@gnu.org>
parents:
7894
diff
changeset
|
2220 /* This function cannot GC. */ |
d4b5f4dd9c51
(Flookup_key): Add gcpro.
Richard M. Stallman <rms@gnu.org>
parents:
7894
diff
changeset
|
2221 |
54925
f0a7441d22f6
(Fkey_description): Add optional PREFIX arg.
Kim F. Storm <storm@cua.dk>
parents:
53808
diff
changeset
|
2222 DEFUN ("key-description", Fkey_description, Skey_description, 1, 2, 0, |
41001
a17c8b15ef1b
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
40804
diff
changeset
|
2223 doc: /* Return a pretty description of key-sequence KEYS. |
54925
f0a7441d22f6
(Fkey_description): Add optional PREFIX arg.
Kim F. Storm <storm@cua.dk>
parents:
53808
diff
changeset
|
2224 Optional arg PREFIX is the sequence of keys leading up to KEYS. |
55913
c663e2e97168
(Fdescribe_vector): Fix docstring.
Juanma Barranquero <lekktu@gmail.com>
parents:
55722
diff
changeset
|
2225 Control characters turn into "C-foo" sequences, meta into "M-foo", |
41001
a17c8b15ef1b
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
40804
diff
changeset
|
2226 spaces are put between sequence elements, etc. */) |
109179
8cfee7d2955f
Convert DEFUNs to standard C.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
109165
diff
changeset
|
2227 (Lisp_Object keys, Lisp_Object prefix) |
250 | 2228 { |
31829
43566b0aec59
Avoid some more compiler warnings.
Gerd Moellmann <gerd@gnu.org>
parents:
31496
diff
changeset
|
2229 int len = 0; |
20624
9ac0b485cf60
(describe_vector): Unconditionally handle multibyte chars.
Richard M. Stallman <rms@gnu.org>
parents:
20576
diff
changeset
|
2230 int i, i_byte; |
54925
f0a7441d22f6
(Fkey_description): Add optional PREFIX arg.
Kim F. Storm <storm@cua.dk>
parents:
53808
diff
changeset
|
2231 Lisp_Object *args; |
55006
5429150a04f3
(Fkey_description): Fix the usual int/Lisp_Object mixup.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
54925
diff
changeset
|
2232 int size = XINT (Flength (keys)); |
54925
f0a7441d22f6
(Fkey_description): Add optional PREFIX arg.
Kim F. Storm <storm@cua.dk>
parents:
53808
diff
changeset
|
2233 Lisp_Object list; |
f0a7441d22f6
(Fkey_description): Add optional PREFIX arg.
Kim F. Storm <storm@cua.dk>
parents:
53808
diff
changeset
|
2234 Lisp_Object sep = build_string (" "); |
f0a7441d22f6
(Fkey_description): Add optional PREFIX arg.
Kim F. Storm <storm@cua.dk>
parents:
53808
diff
changeset
|
2235 Lisp_Object key; |
f0a7441d22f6
(Fkey_description): Add optional PREFIX arg.
Kim F. Storm <storm@cua.dk>
parents:
53808
diff
changeset
|
2236 int add_meta = 0; |
f0a7441d22f6
(Fkey_description): Add optional PREFIX arg.
Kim F. Storm <storm@cua.dk>
parents:
53808
diff
changeset
|
2237 |
f0a7441d22f6
(Fkey_description): Add optional PREFIX arg.
Kim F. Storm <storm@cua.dk>
parents:
53808
diff
changeset
|
2238 if (!NILP (prefix)) |
55006
5429150a04f3
(Fkey_description): Fix the usual int/Lisp_Object mixup.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
54925
diff
changeset
|
2239 size += XINT (Flength (prefix)); |
54925
f0a7441d22f6
(Fkey_description): Add optional PREFIX arg.
Kim F. Storm <storm@cua.dk>
parents:
53808
diff
changeset
|
2240 |
f0a7441d22f6
(Fkey_description): Add optional PREFIX arg.
Kim F. Storm <storm@cua.dk>
parents:
53808
diff
changeset
|
2241 /* This has one extra element at the end that we don't pass to Fconcat. */ |
f0a7441d22f6
(Fkey_description): Add optional PREFIX arg.
Kim F. Storm <storm@cua.dk>
parents:
53808
diff
changeset
|
2242 args = (Lisp_Object *) alloca (size * 4 * sizeof (Lisp_Object)); |
f0a7441d22f6
(Fkey_description): Add optional PREFIX arg.
Kim F. Storm <storm@cua.dk>
parents:
53808
diff
changeset
|
2243 |
f0a7441d22f6
(Fkey_description): Add optional PREFIX arg.
Kim F. Storm <storm@cua.dk>
parents:
53808
diff
changeset
|
2244 /* In effect, this computes |
f0a7441d22f6
(Fkey_description): Add optional PREFIX arg.
Kim F. Storm <storm@cua.dk>
parents:
53808
diff
changeset
|
2245 (mapconcat 'single-key-description keys " ") |
f0a7441d22f6
(Fkey_description): Add optional PREFIX arg.
Kim F. Storm <storm@cua.dk>
parents:
53808
diff
changeset
|
2246 but we shouldn't use mapconcat because it can do GC. */ |
f0a7441d22f6
(Fkey_description): Add optional PREFIX arg.
Kim F. Storm <storm@cua.dk>
parents:
53808
diff
changeset
|
2247 |
f0a7441d22f6
(Fkey_description): Add optional PREFIX arg.
Kim F. Storm <storm@cua.dk>
parents:
53808
diff
changeset
|
2248 next_list: |
f0a7441d22f6
(Fkey_description): Add optional PREFIX arg.
Kim F. Storm <storm@cua.dk>
parents:
53808
diff
changeset
|
2249 if (!NILP (prefix)) |
f0a7441d22f6
(Fkey_description): Add optional PREFIX arg.
Kim F. Storm <storm@cua.dk>
parents:
53808
diff
changeset
|
2250 list = prefix, prefix = Qnil; |
f0a7441d22f6
(Fkey_description): Add optional PREFIX arg.
Kim F. Storm <storm@cua.dk>
parents:
53808
diff
changeset
|
2251 else if (!NILP (keys)) |
f0a7441d22f6
(Fkey_description): Add optional PREFIX arg.
Kim F. Storm <storm@cua.dk>
parents:
53808
diff
changeset
|
2252 list = keys, keys = Qnil; |
f0a7441d22f6
(Fkey_description): Add optional PREFIX arg.
Kim F. Storm <storm@cua.dk>
parents:
53808
diff
changeset
|
2253 else |
2059 | 2254 { |
54925
f0a7441d22f6
(Fkey_description): Add optional PREFIX arg.
Kim F. Storm <storm@cua.dk>
parents:
53808
diff
changeset
|
2255 if (add_meta) |
f0a7441d22f6
(Fkey_description): Add optional PREFIX arg.
Kim F. Storm <storm@cua.dk>
parents:
53808
diff
changeset
|
2256 { |
f0a7441d22f6
(Fkey_description): Add optional PREFIX arg.
Kim F. Storm <storm@cua.dk>
parents:
53808
diff
changeset
|
2257 args[len] = Fsingle_key_description (meta_prefix_char, Qnil); |
f0a7441d22f6
(Fkey_description): Add optional PREFIX arg.
Kim F. Storm <storm@cua.dk>
parents:
53808
diff
changeset
|
2258 len += 2; |
f0a7441d22f6
(Fkey_description): Add optional PREFIX arg.
Kim F. Storm <storm@cua.dk>
parents:
53808
diff
changeset
|
2259 } |
f0a7441d22f6
(Fkey_description): Add optional PREFIX arg.
Kim F. Storm <storm@cua.dk>
parents:
53808
diff
changeset
|
2260 else if (len == 0) |
81281
323c37a99c44
(Fkey_description): Use empty_unibyte_string.
Juanma Barranquero <lekktu@gmail.com>
parents:
80871
diff
changeset
|
2261 return empty_unibyte_string; |
54925
f0a7441d22f6
(Fkey_description): Add optional PREFIX arg.
Kim F. Storm <storm@cua.dk>
parents:
53808
diff
changeset
|
2262 return Fconcat (len - 1, args); |
f0a7441d22f6
(Fkey_description): Add optional PREFIX arg.
Kim F. Storm <storm@cua.dk>
parents:
53808
diff
changeset
|
2263 } |
f0a7441d22f6
(Fkey_description): Add optional PREFIX arg.
Kim F. Storm <storm@cua.dk>
parents:
53808
diff
changeset
|
2264 |
f0a7441d22f6
(Fkey_description): Add optional PREFIX arg.
Kim F. Storm <storm@cua.dk>
parents:
53808
diff
changeset
|
2265 if (STRINGP (list)) |
f0a7441d22f6
(Fkey_description): Add optional PREFIX arg.
Kim F. Storm <storm@cua.dk>
parents:
53808
diff
changeset
|
2266 size = SCHARS (list); |
f0a7441d22f6
(Fkey_description): Add optional PREFIX arg.
Kim F. Storm <storm@cua.dk>
parents:
53808
diff
changeset
|
2267 else if (VECTORP (list)) |
f0a7441d22f6
(Fkey_description): Add optional PREFIX arg.
Kim F. Storm <storm@cua.dk>
parents:
53808
diff
changeset
|
2268 size = XVECTOR (list)->size; |
f0a7441d22f6
(Fkey_description): Add optional PREFIX arg.
Kim F. Storm <storm@cua.dk>
parents:
53808
diff
changeset
|
2269 else if (CONSP (list)) |
55006
5429150a04f3
(Fkey_description): Fix the usual int/Lisp_Object mixup.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
54925
diff
changeset
|
2270 size = XINT (Flength (list)); |
54925
f0a7441d22f6
(Fkey_description): Add optional PREFIX arg.
Kim F. Storm <storm@cua.dk>
parents:
53808
diff
changeset
|
2271 else |
f0a7441d22f6
(Fkey_description): Add optional PREFIX arg.
Kim F. Storm <storm@cua.dk>
parents:
53808
diff
changeset
|
2272 wrong_type_argument (Qarrayp, list); |
f0a7441d22f6
(Fkey_description): Add optional PREFIX arg.
Kim F. Storm <storm@cua.dk>
parents:
53808
diff
changeset
|
2273 |
f0a7441d22f6
(Fkey_description): Add optional PREFIX arg.
Kim F. Storm <storm@cua.dk>
parents:
53808
diff
changeset
|
2274 i = i_byte = 0; |
f0a7441d22f6
(Fkey_description): Add optional PREFIX arg.
Kim F. Storm <storm@cua.dk>
parents:
53808
diff
changeset
|
2275 |
f0a7441d22f6
(Fkey_description): Add optional PREFIX arg.
Kim F. Storm <storm@cua.dk>
parents:
53808
diff
changeset
|
2276 while (i < size) |
f0a7441d22f6
(Fkey_description): Add optional PREFIX arg.
Kim F. Storm <storm@cua.dk>
parents:
53808
diff
changeset
|
2277 { |
f0a7441d22f6
(Fkey_description): Add optional PREFIX arg.
Kim F. Storm <storm@cua.dk>
parents:
53808
diff
changeset
|
2278 if (STRINGP (list)) |
2059 | 2279 { |
20624
9ac0b485cf60
(describe_vector): Unconditionally handle multibyte chars.
Richard M. Stallman <rms@gnu.org>
parents:
20576
diff
changeset
|
2280 int c; |
54925
f0a7441d22f6
(Fkey_description): Add optional PREFIX arg.
Kim F. Storm <storm@cua.dk>
parents:
53808
diff
changeset
|
2281 FETCH_STRING_CHAR_ADVANCE (c, list, i, i_byte); |
29013
b9565b4bcdf8
(Fsingle_key_description): Use SPLIT_CHAR instead of
Kenichi Handa <handa@m17n.org>
parents:
26864
diff
changeset
|
2282 if (SINGLE_BYTE_CHAR_P (c) && (c & 0200)) |
b9565b4bcdf8
(Fsingle_key_description): Use SPLIT_CHAR instead of
Kenichi Handa <handa@m17n.org>
parents:
26864
diff
changeset
|
2283 c ^= 0200 | meta_modifier; |
54925
f0a7441d22f6
(Fkey_description): Add optional PREFIX arg.
Kim F. Storm <storm@cua.dk>
parents:
53808
diff
changeset
|
2284 XSETFASTINT (key, c); |
f0a7441d22f6
(Fkey_description): Add optional PREFIX arg.
Kim F. Storm <storm@cua.dk>
parents:
53808
diff
changeset
|
2285 } |
f0a7441d22f6
(Fkey_description): Add optional PREFIX arg.
Kim F. Storm <storm@cua.dk>
parents:
53808
diff
changeset
|
2286 else if (VECTORP (list)) |
f0a7441d22f6
(Fkey_description): Add optional PREFIX arg.
Kim F. Storm <storm@cua.dk>
parents:
53808
diff
changeset
|
2287 { |
91670
a06d59678f5a
(Fkey_description): Move side effect outside of macro call.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
91327
diff
changeset
|
2288 key = AREF (list, i); i++; |
54925
f0a7441d22f6
(Fkey_description): Add optional PREFIX arg.
Kim F. Storm <storm@cua.dk>
parents:
53808
diff
changeset
|
2289 } |
f0a7441d22f6
(Fkey_description): Add optional PREFIX arg.
Kim F. Storm <storm@cua.dk>
parents:
53808
diff
changeset
|
2290 else |
f0a7441d22f6
(Fkey_description): Add optional PREFIX arg.
Kim F. Storm <storm@cua.dk>
parents:
53808
diff
changeset
|
2291 { |
f0a7441d22f6
(Fkey_description): Add optional PREFIX arg.
Kim F. Storm <storm@cua.dk>
parents:
53808
diff
changeset
|
2292 key = XCAR (list); |
f0a7441d22f6
(Fkey_description): Add optional PREFIX arg.
Kim F. Storm <storm@cua.dk>
parents:
53808
diff
changeset
|
2293 list = XCDR (list); |
f0a7441d22f6
(Fkey_description): Add optional PREFIX arg.
Kim F. Storm <storm@cua.dk>
parents:
53808
diff
changeset
|
2294 i++; |
2059 | 2295 } |
54925
f0a7441d22f6
(Fkey_description): Add optional PREFIX arg.
Kim F. Storm <storm@cua.dk>
parents:
53808
diff
changeset
|
2296 |
f0a7441d22f6
(Fkey_description): Add optional PREFIX arg.
Kim F. Storm <storm@cua.dk>
parents:
53808
diff
changeset
|
2297 if (add_meta) |
23953
c8cdb4e487cb
(Fsingle_key_description): Handle (control ?x) etc.
Richard M. Stallman <rms@gnu.org>
parents:
23776
diff
changeset
|
2298 { |
54925
f0a7441d22f6
(Fkey_description): Add optional PREFIX arg.
Kim F. Storm <storm@cua.dk>
parents:
53808
diff
changeset
|
2299 if (!INTEGERP (key) |
f0a7441d22f6
(Fkey_description): Add optional PREFIX arg.
Kim F. Storm <storm@cua.dk>
parents:
53808
diff
changeset
|
2300 || EQ (key, meta_prefix_char) |
f0a7441d22f6
(Fkey_description): Add optional PREFIX arg.
Kim F. Storm <storm@cua.dk>
parents:
53808
diff
changeset
|
2301 || (XINT (key) & meta_modifier)) |
f0a7441d22f6
(Fkey_description): Add optional PREFIX arg.
Kim F. Storm <storm@cua.dk>
parents:
53808
diff
changeset
|
2302 { |
f0a7441d22f6
(Fkey_description): Add optional PREFIX arg.
Kim F. Storm <storm@cua.dk>
parents:
53808
diff
changeset
|
2303 args[len++] = Fsingle_key_description (meta_prefix_char, Qnil); |
f0a7441d22f6
(Fkey_description): Add optional PREFIX arg.
Kim F. Storm <storm@cua.dk>
parents:
53808
diff
changeset
|
2304 args[len++] = sep; |
f0a7441d22f6
(Fkey_description): Add optional PREFIX arg.
Kim F. Storm <storm@cua.dk>
parents:
53808
diff
changeset
|
2305 if (EQ (key, meta_prefix_char)) |
f0a7441d22f6
(Fkey_description): Add optional PREFIX arg.
Kim F. Storm <storm@cua.dk>
parents:
53808
diff
changeset
|
2306 continue; |
f0a7441d22f6
(Fkey_description): Add optional PREFIX arg.
Kim F. Storm <storm@cua.dk>
parents:
53808
diff
changeset
|
2307 } |
f0a7441d22f6
(Fkey_description): Add optional PREFIX arg.
Kim F. Storm <storm@cua.dk>
parents:
53808
diff
changeset
|
2308 else |
f0a7441d22f6
(Fkey_description): Add optional PREFIX arg.
Kim F. Storm <storm@cua.dk>
parents:
53808
diff
changeset
|
2309 XSETINT (key, (XINT (key) | meta_modifier) & ~0x80); |
f0a7441d22f6
(Fkey_description): Add optional PREFIX arg.
Kim F. Storm <storm@cua.dk>
parents:
53808
diff
changeset
|
2310 add_meta = 0; |
23953
c8cdb4e487cb
(Fsingle_key_description): Handle (control ?x) etc.
Richard M. Stallman <rms@gnu.org>
parents:
23776
diff
changeset
|
2311 } |
54925
f0a7441d22f6
(Fkey_description): Add optional PREFIX arg.
Kim F. Storm <storm@cua.dk>
parents:
53808
diff
changeset
|
2312 else if (EQ (key, meta_prefix_char)) |
f0a7441d22f6
(Fkey_description): Add optional PREFIX arg.
Kim F. Storm <storm@cua.dk>
parents:
53808
diff
changeset
|
2313 { |
f0a7441d22f6
(Fkey_description): Add optional PREFIX arg.
Kim F. Storm <storm@cua.dk>
parents:
53808
diff
changeset
|
2314 add_meta = 1; |
f0a7441d22f6
(Fkey_description): Add optional PREFIX arg.
Kim F. Storm <storm@cua.dk>
parents:
53808
diff
changeset
|
2315 continue; |
f0a7441d22f6
(Fkey_description): Add optional PREFIX arg.
Kim F. Storm <storm@cua.dk>
parents:
53808
diff
changeset
|
2316 } |
f0a7441d22f6
(Fkey_description): Add optional PREFIX arg.
Kim F. Storm <storm@cua.dk>
parents:
53808
diff
changeset
|
2317 args[len++] = Fsingle_key_description (key, Qnil); |
f0a7441d22f6
(Fkey_description): Add optional PREFIX arg.
Kim F. Storm <storm@cua.dk>
parents:
53808
diff
changeset
|
2318 args[len++] = sep; |
23953
c8cdb4e487cb
(Fsingle_key_description): Handle (control ?x) etc.
Richard M. Stallman <rms@gnu.org>
parents:
23776
diff
changeset
|
2319 } |
54925
f0a7441d22f6
(Fkey_description): Add optional PREFIX arg.
Kim F. Storm <storm@cua.dk>
parents:
53808
diff
changeset
|
2320 goto next_list; |
250 | 2321 } |
2322 | |
54925
f0a7441d22f6
(Fkey_description): Add optional PREFIX arg.
Kim F. Storm <storm@cua.dk>
parents:
53808
diff
changeset
|
2323 |
250 | 2324 char * |
109126
aec1143e8d85
Convert (most) functions in src to standard C.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
109100
diff
changeset
|
2325 push_key_description (register unsigned int c, register char *p, int force_multibyte) |
250 | 2326 { |
30780
b4fcea50ee82
(push_key_description): If C without modifiers is < 32,
Gerd Moellmann <gerd@gnu.org>
parents:
30609
diff
changeset
|
2327 unsigned c2; |
45279
220c13a65624
(keymap_parent): New fun, extracted from Fkeymap_parent.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
45235
diff
changeset
|
2328 |
2343
ddb30eaf2f56
(push_key_description): Ignore bits above meta_modifier.
Richard M. Stallman <rms@gnu.org>
parents:
2093
diff
changeset
|
2329 /* Clear all the meaningless bits above the meta bit. */ |
ddb30eaf2f56
(push_key_description): Ignore bits above meta_modifier.
Richard M. Stallman <rms@gnu.org>
parents:
2093
diff
changeset
|
2330 c &= meta_modifier | ~ - meta_modifier; |
30780
b4fcea50ee82
(push_key_description): If C without modifiers is < 32,
Gerd Moellmann <gerd@gnu.org>
parents:
30609
diff
changeset
|
2331 c2 = c & ~(alt_modifier | ctrl_modifier | hyper_modifier |
b4fcea50ee82
(push_key_description): If C without modifiers is < 32,
Gerd Moellmann <gerd@gnu.org>
parents:
30609
diff
changeset
|
2332 | meta_modifier | shift_modifier | super_modifier); |
2343
ddb30eaf2f56
(push_key_description): Ignore bits above meta_modifier.
Richard M. Stallman <rms@gnu.org>
parents:
2093
diff
changeset
|
2333 |
90390
9b61abfe926b
(push_key_description): Fix synching with HEAD.
Kenichi Handa <handa@m17n.org>
parents:
90389
diff
changeset
|
2334 if (! CHARACTERP (make_number (c2))) |
70535
8003a30510ee
(push_key_description): Handle invalid character key.
Kenichi Handa <handa@m17n.org>
parents:
70293
diff
changeset
|
2335 { |
8003a30510ee
(push_key_description): Handle invalid character key.
Kenichi Handa <handa@m17n.org>
parents:
70293
diff
changeset
|
2336 /* KEY_DESCRIPTION_SIZE is large enough for this. */ |
8003a30510ee
(push_key_description): Handle invalid character key.
Kenichi Handa <handa@m17n.org>
parents:
70293
diff
changeset
|
2337 p += sprintf (p, "[%d]", c); |
8003a30510ee
(push_key_description): Handle invalid character key.
Kenichi Handa <handa@m17n.org>
parents:
70293
diff
changeset
|
2338 return p; |
8003a30510ee
(push_key_description): Handle invalid character key.
Kenichi Handa <handa@m17n.org>
parents:
70293
diff
changeset
|
2339 } |
8003a30510ee
(push_key_description): Handle invalid character key.
Kenichi Handa <handa@m17n.org>
parents:
70293
diff
changeset
|
2340 |
2059 | 2341 if (c & alt_modifier) |
2342 { | |
2343 *p++ = 'A'; | |
2344 *p++ = '-'; | |
2345 c -= alt_modifier; | |
2346 } | |
30780
b4fcea50ee82
(push_key_description): If C without modifiers is < 32,
Gerd Moellmann <gerd@gnu.org>
parents:
30609
diff
changeset
|
2347 if ((c & ctrl_modifier) != 0 |
b4fcea50ee82
(push_key_description): If C without modifiers is < 32,
Gerd Moellmann <gerd@gnu.org>
parents:
30609
diff
changeset
|
2348 || (c2 < ' ' && c2 != 27 && c2 != '\t' && c2 != Ctl ('M'))) |
2059 | 2349 { |
2350 *p++ = 'C'; | |
2351 *p++ = '-'; | |
30780
b4fcea50ee82
(push_key_description): If C without modifiers is < 32,
Gerd Moellmann <gerd@gnu.org>
parents:
30609
diff
changeset
|
2352 c &= ~ctrl_modifier; |
2059 | 2353 } |
2354 if (c & hyper_modifier) | |
2355 { | |
2356 *p++ = 'H'; | |
2357 *p++ = '-'; | |
2358 c -= hyper_modifier; | |
2359 } | |
2360 if (c & meta_modifier) | |
250 | 2361 { |
2362 *p++ = 'M'; | |
2363 *p++ = '-'; | |
2059 | 2364 c -= meta_modifier; |
2365 } | |
2366 if (c & shift_modifier) | |
2367 { | |
2368 *p++ = 'S'; | |
2369 *p++ = '-'; | |
2370 c -= shift_modifier; | |
2371 } | |
2372 if (c & super_modifier) | |
2373 { | |
2374 *p++ = 's'; | |
2375 *p++ = '-'; | |
2376 c -= super_modifier; | |
250 | 2377 } |
2378 if (c < 040) | |
2379 { | |
2380 if (c == 033) | |
2381 { | |
2382 *p++ = 'E'; | |
2383 *p++ = 'S'; | |
2384 *p++ = 'C'; | |
2385 } | |
2059 | 2386 else if (c == '\t') |
250 | 2387 { |
2388 *p++ = 'T'; | |
2389 *p++ = 'A'; | |
2390 *p++ = 'B'; | |
2391 } | |
16875
d9956cf6699b
(push_key_description): Print C-j, not TAB.
Richard M. Stallman <rms@gnu.org>
parents:
16465
diff
changeset
|
2392 else if (c == Ctl ('M')) |
250 | 2393 { |
2394 *p++ = 'R'; | |
2395 *p++ = 'E'; | |
2396 *p++ = 'T'; | |
2397 } | |
2398 else | |
2399 { | |
30780
b4fcea50ee82
(push_key_description): If C without modifiers is < 32,
Gerd Moellmann <gerd@gnu.org>
parents:
30609
diff
changeset
|
2400 /* `C-' already added above. */ |
250 | 2401 if (c > 0 && c <= Ctl ('Z')) |
2402 *p++ = c + 0140; | |
2403 else | |
2404 *p++ = c + 0100; | |
2405 } | |
2406 } | |
2407 else if (c == 0177) | |
2408 { | |
2409 *p++ = 'D'; | |
2410 *p++ = 'E'; | |
2411 *p++ = 'L'; | |
2412 } | |
2413 else if (c == ' ') | |
24394
8159c8cb33cc
(push_key_description): If enable-multibyte-characters
Kenichi Handa <handa@m17n.org>
parents:
23968
diff
changeset
|
2414 { |
250 | 2415 *p++ = 'S'; |
2416 *p++ = 'P'; | |
2417 *p++ = 'C'; | |
2418 } | |
24396
340189fd508f
(push_key_description): If enable-multibyte-characters
Kenichi Handa <handa@m17n.org>
parents:
24394
diff
changeset
|
2419 else if (c < 128 |
340189fd508f
(push_key_description): If enable-multibyte-characters
Kenichi Handa <handa@m17n.org>
parents:
24394
diff
changeset
|
2420 || (NILP (current_buffer->enable_multibyte_characters) |
34906
333a490b6ebc
(push_key_description): Add parameter FORCE_MULTIBYTE.
Gerd Moellmann <gerd@gnu.org>
parents:
34765
diff
changeset
|
2421 && SINGLE_BYTE_CHAR_P (c) |
333a490b6ebc
(push_key_description): Add parameter FORCE_MULTIBYTE.
Gerd Moellmann <gerd@gnu.org>
parents:
34765
diff
changeset
|
2422 && !force_multibyte)) |
333a490b6ebc
(push_key_description): Add parameter FORCE_MULTIBYTE.
Gerd Moellmann <gerd@gnu.org>
parents:
34765
diff
changeset
|
2423 { |
333a490b6ebc
(push_key_description): Add parameter FORCE_MULTIBYTE.
Gerd Moellmann <gerd@gnu.org>
parents:
34765
diff
changeset
|
2424 *p++ = c; |
333a490b6ebc
(push_key_description): Add parameter FORCE_MULTIBYTE.
Gerd Moellmann <gerd@gnu.org>
parents:
34765
diff
changeset
|
2425 } |
250 | 2426 else |
2059 | 2427 { |
90390
9b61abfe926b
(push_key_description): Fix synching with HEAD.
Kenichi Handa <handa@m17n.org>
parents:
90389
diff
changeset
|
2428 /* Now we are sure that C is a valid character code. */ |
89175
adc5b06c6722
(push_key_description): Pay attention to force_multibyte.
Kenichi Handa <handa@m17n.org>
parents:
88932
diff
changeset
|
2429 if (NILP (current_buffer->enable_multibyte_characters) |
adc5b06c6722
(push_key_description): Pay attention to force_multibyte.
Kenichi Handa <handa@m17n.org>
parents:
88932
diff
changeset
|
2430 && ! force_multibyte) |
88380 | 2431 *p++ = multibyte_char_to_unibyte (c, Qnil); |
24394
8159c8cb33cc
(push_key_description): If enable-multibyte-characters
Kenichi Handa <handa@m17n.org>
parents:
23968
diff
changeset
|
2432 else |
88380 | 2433 p += CHAR_STRING (c, (unsigned char *) p); |
2059 | 2434 } |
250 | 2435 |
41293
3db86c7bf56f
(Fdescribe_vector): Add `describer' parameter.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
41001
diff
changeset
|
2436 return p; |
250 | 2437 } |
2438 | |
7998
d4b5f4dd9c51
(Flookup_key): Add gcpro.
Richard M. Stallman <rms@gnu.org>
parents:
7894
diff
changeset
|
2439 /* This function cannot GC. */ |
d4b5f4dd9c51
(Flookup_key): Add gcpro.
Richard M. Stallman <rms@gnu.org>
parents:
7894
diff
changeset
|
2440 |
30559
16a291eedbd8
(Fsingle_key_description): Add parameter NO_ANGLES.
Gerd Moellmann <gerd@gnu.org>
parents:
30134
diff
changeset
|
2441 DEFUN ("single-key-description", Fsingle_key_description, |
16a291eedbd8
(Fsingle_key_description): Add parameter NO_ANGLES.
Gerd Moellmann <gerd@gnu.org>
parents:
30134
diff
changeset
|
2442 Ssingle_key_description, 1, 2, 0, |
41001
a17c8b15ef1b
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
40804
diff
changeset
|
2443 doc: /* Return a pretty description of command character KEY. |
a17c8b15ef1b
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
40804
diff
changeset
|
2444 Control characters turn into C-whatever, etc. |
a17c8b15ef1b
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
40804
diff
changeset
|
2445 Optional argument NO-ANGLES non-nil means don't put angle brackets |
a17c8b15ef1b
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
40804
diff
changeset
|
2446 around function keys and event symbols. */) |
109179
8cfee7d2955f
Convert DEFUNs to standard C.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
109165
diff
changeset
|
2447 (Lisp_Object key, Lisp_Object no_angles) |
250 | 2448 { |
23953
c8cdb4e487cb
(Fsingle_key_description): Handle (control ?x) etc.
Richard M. Stallman <rms@gnu.org>
parents:
23776
diff
changeset
|
2449 if (CONSP (key) && lucid_event_type_list_p (key)) |
c8cdb4e487cb
(Fsingle_key_description): Handle (control ?x) etc.
Richard M. Stallman <rms@gnu.org>
parents:
23776
diff
changeset
|
2450 key = Fevent_convert_list (key); |
c8cdb4e487cb
(Fsingle_key_description): Handle (control ?x) etc.
Richard M. Stallman <rms@gnu.org>
parents:
23776
diff
changeset
|
2451 |
1315
884c3d7e7172
* keymap.c (access_keymap, store_in_keymap,
Jim Blandy <jimb@redhat.com>
parents:
1264
diff
changeset
|
2452 key = EVENT_HEAD (key); |
517 | 2453 |
10008
b83150a8020d
(Fsingle_key_description): Use type test macros.
Karl Heuer <kwzh@gnu.org>
parents:
9973
diff
changeset
|
2454 if (INTEGERP (key)) /* Normal character */ |
250 | 2455 { |
88380 | 2456 char tem[KEY_DESCRIPTION_SIZE]; |
2457 | |
2458 *push_key_description (XUINT (key), tem, 1) = 0; | |
2459 return build_string (tem); | |
250 | 2460 } |
10008
b83150a8020d
(Fsingle_key_description): Use type test macros.
Karl Heuer <kwzh@gnu.org>
parents:
9973
diff
changeset
|
2461 else if (SYMBOLP (key)) /* Function key or event-symbol */ |
29651
31099bb76b6e
(Fsingle_key_description): Enclose function key and
Gerd Moellmann <gerd@gnu.org>
parents:
29282
diff
changeset
|
2462 { |
30559
16a291eedbd8
(Fsingle_key_description): Add parameter NO_ANGLES.
Gerd Moellmann <gerd@gnu.org>
parents:
30134
diff
changeset
|
2463 if (NILP (no_angles)) |
16a291eedbd8
(Fsingle_key_description): Add parameter NO_ANGLES.
Gerd Moellmann <gerd@gnu.org>
parents:
30134
diff
changeset
|
2464 { |
16a291eedbd8
(Fsingle_key_description): Add parameter NO_ANGLES.
Gerd Moellmann <gerd@gnu.org>
parents:
30134
diff
changeset
|
2465 char *buffer |
46370
40db0673e6f0
Most uses of XSTRING combined with STRING_BYTES or indirection changed to
Ken Raeburn <raeburn@raeburn.org>
parents:
46310
diff
changeset
|
2466 = (char *) alloca (SBYTES (SYMBOL_NAME (key)) + 5); |
40db0673e6f0
Most uses of XSTRING combined with STRING_BYTES or indirection changed to
Ken Raeburn <raeburn@raeburn.org>
parents:
46310
diff
changeset
|
2467 sprintf (buffer, "<%s>", SDATA (SYMBOL_NAME (key))); |
30559
16a291eedbd8
(Fsingle_key_description): Add parameter NO_ANGLES.
Gerd Moellmann <gerd@gnu.org>
parents:
30134
diff
changeset
|
2468 return build_string (buffer); |
16a291eedbd8
(Fsingle_key_description): Add parameter NO_ANGLES.
Gerd Moellmann <gerd@gnu.org>
parents:
30134
diff
changeset
|
2469 } |
16a291eedbd8
(Fsingle_key_description): Add parameter NO_ANGLES.
Gerd Moellmann <gerd@gnu.org>
parents:
30134
diff
changeset
|
2470 else |
16a291eedbd8
(Fsingle_key_description): Add parameter NO_ANGLES.
Gerd Moellmann <gerd@gnu.org>
parents:
30134
diff
changeset
|
2471 return Fsymbol_name (key); |
29651
31099bb76b6e
(Fsingle_key_description): Enclose function key and
Gerd Moellmann <gerd@gnu.org>
parents:
29282
diff
changeset
|
2472 } |
10008
b83150a8020d
(Fsingle_key_description): Use type test macros.
Karl Heuer <kwzh@gnu.org>
parents:
9973
diff
changeset
|
2473 else if (STRINGP (key)) /* Buffer names in the menubar. */ |
b83150a8020d
(Fsingle_key_description): Use type test macros.
Karl Heuer <kwzh@gnu.org>
parents:
9973
diff
changeset
|
2474 return Fcopy_sequence (key); |
b83150a8020d
(Fsingle_key_description): Use type test macros.
Karl Heuer <kwzh@gnu.org>
parents:
9973
diff
changeset
|
2475 else |
b83150a8020d
(Fsingle_key_description): Use type test macros.
Karl Heuer <kwzh@gnu.org>
parents:
9973
diff
changeset
|
2476 error ("KEY must be an integer, cons, symbol, or string"); |
31829
43566b0aec59
Avoid some more compiler warnings.
Gerd Moellmann <gerd@gnu.org>
parents:
31496
diff
changeset
|
2477 return Qnil; |
250 | 2478 } |
2479 | |
2480 char * | |
109126
aec1143e8d85
Convert (most) functions in src to standard C.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
109100
diff
changeset
|
2481 push_text_char_description (register unsigned int c, register char *p) |
250 | 2482 { |
2483 if (c >= 0200) | |
2484 { | |
2485 *p++ = 'M'; | |
2486 *p++ = '-'; | |
2487 c -= 0200; | |
2488 } | |
2489 if (c < 040) | |
2490 { | |
2491 *p++ = '^'; | |
2492 *p++ = c + 64; /* 'A' - 1 */ | |
2493 } | |
2494 else if (c == 0177) | |
2495 { | |
2496 *p++ = '^'; | |
2497 *p++ = '?'; | |
2498 } | |
2499 else | |
2500 *p++ = c; | |
41293
3db86c7bf56f
(Fdescribe_vector): Add `describer' parameter.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
41001
diff
changeset
|
2501 return p; |
250 | 2502 } |
2503 | |
7998
d4b5f4dd9c51
(Flookup_key): Add gcpro.
Richard M. Stallman <rms@gnu.org>
parents:
7894
diff
changeset
|
2504 /* This function cannot GC. */ |
d4b5f4dd9c51
(Flookup_key): Add gcpro.
Richard M. Stallman <rms@gnu.org>
parents:
7894
diff
changeset
|
2505 |
250 | 2506 DEFUN ("text-char-description", Ftext_char_description, Stext_char_description, 1, 1, 0, |
41001
a17c8b15ef1b
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
40804
diff
changeset
|
2507 doc: /* Return a pretty description of file-character CHARACTER. |
56217
dd79816933ec
(Ftext_char_description): Doc fix.
Luc Teirlinck <teirllm@auburn.edu>
parents:
55913
diff
changeset
|
2508 Control characters turn into "^char", etc. This differs from |
dd79816933ec
(Ftext_char_description): Doc fix.
Luc Teirlinck <teirllm@auburn.edu>
parents:
55913
diff
changeset
|
2509 `single-key-description' which turns them into "C-char". |
dd79816933ec
(Ftext_char_description): Doc fix.
Luc Teirlinck <teirllm@auburn.edu>
parents:
55913
diff
changeset
|
2510 Also, this function recognizes the 2**7 bit as the Meta character, |
dd79816933ec
(Ftext_char_description): Doc fix.
Luc Teirlinck <teirllm@auburn.edu>
parents:
55913
diff
changeset
|
2511 whereas `single-key-description' uses the 2**27 bit for Meta. |
dd79816933ec
(Ftext_char_description): Doc fix.
Luc Teirlinck <teirllm@auburn.edu>
parents:
55913
diff
changeset
|
2512 See Info node `(elisp)Describing Characters' for examples. */) |
109179
8cfee7d2955f
Convert DEFUNs to standard C.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
109165
diff
changeset
|
2513 (Lisp_Object character) |
250 | 2514 { |
26864
b89eb8bbaff1
(push_key_description): Adjusted for the change of
Kenichi Handa <handa@m17n.org>
parents:
26481
diff
changeset
|
2515 /* Currently MAX_MULTIBYTE_LENGTH is 4 (< 6). */ |
b89eb8bbaff1
(push_key_description): Adjusted for the change of
Kenichi Handa <handa@m17n.org>
parents:
26481
diff
changeset
|
2516 unsigned char str[6]; |
b89eb8bbaff1
(push_key_description): Adjusted for the change of
Kenichi Handa <handa@m17n.org>
parents:
26481
diff
changeset
|
2517 int c; |
250 | 2518 |
40656
cdfd4d09b79a
Update usage of CHECK_ macros (remove unused second argument).
Pavel Janík <Pavel@Janik.cz>
parents:
40625
diff
changeset
|
2519 CHECK_NUMBER (character); |
14080
439185f0ef37
(Fkeymapp, Fdefine_prefix_command, Faccessible_keymaps,
Erik Naggum <erik@naggum.no>
parents:
13947
diff
changeset
|
2520 |
26864
b89eb8bbaff1
(push_key_description): Adjusted for the change of
Kenichi Handa <handa@m17n.org>
parents:
26481
diff
changeset
|
2521 c = XINT (character); |
89212
c5637be14c7f
(Ftext_char_description): Check C by ASCII_CHAR_P, not
Kenichi Handa <handa@m17n.org>
parents:
89175
diff
changeset
|
2522 if (!ASCII_CHAR_P (c)) |
17036 | 2523 { |
26864
b89eb8bbaff1
(push_key_description): Adjusted for the change of
Kenichi Handa <handa@m17n.org>
parents:
26481
diff
changeset
|
2524 int len = CHAR_STRING (c, str); |
17036 | 2525 |
20624
9ac0b485cf60
(describe_vector): Unconditionally handle multibyte chars.
Richard M. Stallman <rms@gnu.org>
parents:
20576
diff
changeset
|
2526 return make_multibyte_string (str, 1, len); |
17036 | 2527 } |
2528 | |
26864
b89eb8bbaff1
(push_key_description): Adjusted for the change of
Kenichi Handa <handa@m17n.org>
parents:
26481
diff
changeset
|
2529 *push_text_char_description (c & 0377, str) = 0; |
b89eb8bbaff1
(push_key_description): Adjusted for the change of
Kenichi Handa <handa@m17n.org>
parents:
26481
diff
changeset
|
2530 |
b89eb8bbaff1
(push_key_description): Adjusted for the change of
Kenichi Handa <handa@m17n.org>
parents:
26481
diff
changeset
|
2531 return build_string (str); |
250 | 2532 } |
2727
b8911c8b9700
* keymap.c (Fwhere_is_internal): If FIRSTONLY is non-nil, avoid
Jim Blandy <jimb@redhat.com>
parents:
2652
diff
changeset
|
2533 |
96747
ebf3bd5f0017
* keymap.c: Remove all NS-specific code.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
96675
diff
changeset
|
2534 static int where_is_preferred_modifier; |
ebf3bd5f0017
* keymap.c: Remove all NS-specific code.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
96675
diff
changeset
|
2535 |
ebf3bd5f0017
* keymap.c: Remove all NS-specific code.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
96675
diff
changeset
|
2536 /* Return 0 if SEQ uses non-preferred modifiers or non-char events. |
ebf3bd5f0017
* keymap.c: Remove all NS-specific code.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
96675
diff
changeset
|
2537 Else, return 2 if SEQ uses the where_is_preferred_modifier, |
ebf3bd5f0017
* keymap.c: Remove all NS-specific code.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
96675
diff
changeset
|
2538 and 1 otherwise. */ |
2727
b8911c8b9700
* keymap.c (Fwhere_is_internal): If FIRSTONLY is non-nil, avoid
Jim Blandy <jimb@redhat.com>
parents:
2652
diff
changeset
|
2539 static int |
109126
aec1143e8d85
Convert (most) functions in src to standard C.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
109100
diff
changeset
|
2540 preferred_sequence_p (Lisp_Object seq) |
2727
b8911c8b9700
* keymap.c (Fwhere_is_internal): If FIRSTONLY is non-nil, avoid
Jim Blandy <jimb@redhat.com>
parents:
2652
diff
changeset
|
2541 { |
9312
dfaf1d41e53d
(synkey, access_keymap, store_in_keymap, Faccessible_keymaps,
Karl Heuer <kwzh@gnu.org>
parents:
9273
diff
changeset
|
2542 int i; |
2727
b8911c8b9700
* keymap.c (Fwhere_is_internal): If FIRSTONLY is non-nil, avoid
Jim Blandy <jimb@redhat.com>
parents:
2652
diff
changeset
|
2543 int len = XINT (Flength (seq)); |
96747
ebf3bd5f0017
* keymap.c: Remove all NS-specific code.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
96675
diff
changeset
|
2544 int result = 1; |
6008
d3ccce72be00
(get_keyelt): Discard keyboard equivalents
Richard M. Stallman <rms@gnu.org>
parents:
5785
diff
changeset
|
2545 |
9312
dfaf1d41e53d
(synkey, access_keymap, store_in_keymap, Faccessible_keymaps,
Karl Heuer <kwzh@gnu.org>
parents:
9273
diff
changeset
|
2546 for (i = 0; i < len; i++) |
2727
b8911c8b9700
* keymap.c (Fwhere_is_internal): If FIRSTONLY is non-nil, avoid
Jim Blandy <jimb@redhat.com>
parents:
2652
diff
changeset
|
2547 { |
9312
dfaf1d41e53d
(synkey, access_keymap, store_in_keymap, Faccessible_keymaps,
Karl Heuer <kwzh@gnu.org>
parents:
9273
diff
changeset
|
2548 Lisp_Object ii, elt; |
6008
d3ccce72be00
(get_keyelt): Discard keyboard equivalents
Richard M. Stallman <rms@gnu.org>
parents:
5785
diff
changeset
|
2549 |
9312
dfaf1d41e53d
(synkey, access_keymap, store_in_keymap, Faccessible_keymaps,
Karl Heuer <kwzh@gnu.org>
parents:
9273
diff
changeset
|
2550 XSETFASTINT (ii, i); |
dfaf1d41e53d
(synkey, access_keymap, store_in_keymap, Faccessible_keymaps,
Karl Heuer <kwzh@gnu.org>
parents:
9273
diff
changeset
|
2551 elt = Faref (seq, ii); |
2727
b8911c8b9700
* keymap.c (Fwhere_is_internal): If FIRSTONLY is non-nil, avoid
Jim Blandy <jimb@redhat.com>
parents:
2652
diff
changeset
|
2552 |
96747
ebf3bd5f0017
* keymap.c: Remove all NS-specific code.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
96675
diff
changeset
|
2553 if (!INTEGERP (elt)) |
2727
b8911c8b9700
* keymap.c (Fwhere_is_internal): If FIRSTONLY is non-nil, avoid
Jim Blandy <jimb@redhat.com>
parents:
2652
diff
changeset
|
2554 return 0; |
96747
ebf3bd5f0017
* keymap.c: Remove all NS-specific code.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
96675
diff
changeset
|
2555 else |
ebf3bd5f0017
* keymap.c: Remove all NS-specific code.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
96675
diff
changeset
|
2556 { |
ebf3bd5f0017
* keymap.c: Remove all NS-specific code.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
96675
diff
changeset
|
2557 int modifiers = XUINT (elt) & (CHAR_MODIFIER_MASK & ~CHAR_META); |
ebf3bd5f0017
* keymap.c: Remove all NS-specific code.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
96675
diff
changeset
|
2558 if (modifiers == where_is_preferred_modifier) |
ebf3bd5f0017
* keymap.c: Remove all NS-specific code.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
96675
diff
changeset
|
2559 result = 2; |
ebf3bd5f0017
* keymap.c: Remove all NS-specific code.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
96675
diff
changeset
|
2560 else if (modifiers) |
ebf3bd5f0017
* keymap.c: Remove all NS-specific code.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
96675
diff
changeset
|
2561 return 0; |
ebf3bd5f0017
* keymap.c: Remove all NS-specific code.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
96675
diff
changeset
|
2562 } |
2727
b8911c8b9700
* keymap.c (Fwhere_is_internal): If FIRSTONLY is non-nil, avoid
Jim Blandy <jimb@redhat.com>
parents:
2652
diff
changeset
|
2563 } |
b8911c8b9700
* keymap.c (Fwhere_is_internal): If FIRSTONLY is non-nil, avoid
Jim Blandy <jimb@redhat.com>
parents:
2652
diff
changeset
|
2564 |
96747
ebf3bd5f0017
* keymap.c: Remove all NS-specific code.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
96675
diff
changeset
|
2565 return result; |
2727
b8911c8b9700
* keymap.c (Fwhere_is_internal): If FIRSTONLY is non-nil, avoid
Jim Blandy <jimb@redhat.com>
parents:
2652
diff
changeset
|
2566 } |
b8911c8b9700
* keymap.c (Fwhere_is_internal): If FIRSTONLY is non-nil, avoid
Jim Blandy <jimb@redhat.com>
parents:
2652
diff
changeset
|
2567 |
250 | 2568 |
465 | 2569 /* where-is - finding a command in a set of keymaps. */ |
2570 | |
109100
2bc9a0c04c87
Remove __P and P_ from .c and .m files and definition of P_
Jan D <jan.h.d@swipnet.se>
parents:
108858
diff
changeset
|
2571 static void where_is_internal_1 (Lisp_Object key, Lisp_Object binding, |
2bc9a0c04c87
Remove __P and P_ from .c and .m files and definition of P_
Jan D <jan.h.d@swipnet.se>
parents:
108858
diff
changeset
|
2572 Lisp_Object args, void *data); |
17788
208d71ea3a4f
(get_keyelt): Handle an indirect entry with meta char.
Richard M. Stallman <rms@gnu.org>
parents:
17511
diff
changeset
|
2573 |
32846
c1b3ab2a1ccc
Use AREF, ASET and ASIZE macros.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
32844
diff
changeset
|
2574 /* Like Flookup_key, but uses a list of keymaps SHADOW instead of a single map. |
106972
d026329addd9
* keymap.c (shadow_lookup): Add `remap' arg.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
106815
diff
changeset
|
2575 Returns the first non-nil binding found in any of those maps. |
d026329addd9
* keymap.c (shadow_lookup): Add `remap' arg.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
106815
diff
changeset
|
2576 If REMAP is true, pass the result of the lookup through command |
d026329addd9
* keymap.c (shadow_lookup): Add `remap' arg.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
106815
diff
changeset
|
2577 remapping before returning it. */ |
32846
c1b3ab2a1ccc
Use AREF, ASET and ASIZE macros.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
32844
diff
changeset
|
2578 |
c1b3ab2a1ccc
Use AREF, ASET and ASIZE macros.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
32844
diff
changeset
|
2579 static Lisp_Object |
106972
d026329addd9
* keymap.c (shadow_lookup): Add `remap' arg.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
106815
diff
changeset
|
2580 shadow_lookup (Lisp_Object shadow, Lisp_Object key, Lisp_Object flag, |
d026329addd9
* keymap.c (shadow_lookup): Add `remap' arg.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
106815
diff
changeset
|
2581 int remap) |
32846
c1b3ab2a1ccc
Use AREF, ASET and ASIZE macros.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
32844
diff
changeset
|
2582 { |
c1b3ab2a1ccc
Use AREF, ASET and ASIZE macros.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
32844
diff
changeset
|
2583 Lisp_Object tail, value; |
c1b3ab2a1ccc
Use AREF, ASET and ASIZE macros.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
32844
diff
changeset
|
2584 |
c1b3ab2a1ccc
Use AREF, ASET and ASIZE macros.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
32844
diff
changeset
|
2585 for (tail = shadow; CONSP (tail); tail = XCDR (tail)) |
c1b3ab2a1ccc
Use AREF, ASET and ASIZE macros.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
32844
diff
changeset
|
2586 { |
c1b3ab2a1ccc
Use AREF, ASET and ASIZE macros.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
32844
diff
changeset
|
2587 value = Flookup_key (XCAR (tail), key, flag); |
66757
3f4ee1926eb1
(shadow_lookup): If Flookup_key returns a number,
Juri Linkov <juri@jurta.org>
parents:
65456
diff
changeset
|
2588 if (NATNUMP (value)) |
3f4ee1926eb1
(shadow_lookup): If Flookup_key returns a number,
Juri Linkov <juri@jurta.org>
parents:
65456
diff
changeset
|
2589 { |
67070
c83903b9e676
(shadow_lookup): Use make_number to pass a number to Fsubstring.
Ken Raeburn <raeburn@raeburn.org>
parents:
66757
diff
changeset
|
2590 value = Flookup_key (XCAR (tail), |
c83903b9e676
(shadow_lookup): Use make_number to pass a number to Fsubstring.
Ken Raeburn <raeburn@raeburn.org>
parents:
66757
diff
changeset
|
2591 Fsubstring (key, make_number (0), value), flag); |
66757
3f4ee1926eb1
(shadow_lookup): If Flookup_key returns a number,
Juri Linkov <juri@jurta.org>
parents:
65456
diff
changeset
|
2592 if (!NILP (value)) |
3f4ee1926eb1
(shadow_lookup): If Flookup_key returns a number,
Juri Linkov <juri@jurta.org>
parents:
65456
diff
changeset
|
2593 return Qnil; |
3f4ee1926eb1
(shadow_lookup): If Flookup_key returns a number,
Juri Linkov <juri@jurta.org>
parents:
65456
diff
changeset
|
2594 } |
3f4ee1926eb1
(shadow_lookup): If Flookup_key returns a number,
Juri Linkov <juri@jurta.org>
parents:
65456
diff
changeset
|
2595 else if (!NILP (value)) |
106972
d026329addd9
* keymap.c (shadow_lookup): Add `remap' arg.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
106815
diff
changeset
|
2596 { |
d026329addd9
* keymap.c (shadow_lookup): Add `remap' arg.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
106815
diff
changeset
|
2597 Lisp_Object remapping; |
d026329addd9
* keymap.c (shadow_lookup): Add `remap' arg.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
106815
diff
changeset
|
2598 if (remap && SYMBOLP (value) |
d026329addd9
* keymap.c (shadow_lookup): Add `remap' arg.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
106815
diff
changeset
|
2599 && (remapping = Fcommand_remapping (value, Qnil, shadow), |
d026329addd9
* keymap.c (shadow_lookup): Add `remap' arg.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
106815
diff
changeset
|
2600 !NILP (remapping))) |
d026329addd9
* keymap.c (shadow_lookup): Add `remap' arg.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
106815
diff
changeset
|
2601 return remapping; |
d026329addd9
* keymap.c (shadow_lookup): Add `remap' arg.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
106815
diff
changeset
|
2602 else |
d026329addd9
* keymap.c (shadow_lookup): Add `remap' arg.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
106815
diff
changeset
|
2603 return value; |
d026329addd9
* keymap.c (shadow_lookup): Add `remap' arg.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
106815
diff
changeset
|
2604 } |
32846
c1b3ab2a1ccc
Use AREF, ASET and ASIZE macros.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
32844
diff
changeset
|
2605 } |
c1b3ab2a1ccc
Use AREF, ASET and ASIZE macros.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
32844
diff
changeset
|
2606 return Qnil; |
c1b3ab2a1ccc
Use AREF, ASET and ASIZE macros.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
32844
diff
changeset
|
2607 } |
c1b3ab2a1ccc
Use AREF, ASET and ASIZE macros.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
32844
diff
changeset
|
2608 |
53808
aa6be081315b
(Vmouse_events): Rename from Vmenu_events.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
52740
diff
changeset
|
2609 static Lisp_Object Vmouse_events; |
50141
3770fda038d0
(Vmenu_events): New var.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49912
diff
changeset
|
2610 |
81792
4ee4f467ca51
(struct accessible_keymaps_data, struct where_is_internal_data): New structs.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
81609
diff
changeset
|
2611 struct where_is_internal_data { |
104918
cd8d62c35d57
* keymap.c (where_is_internal_data): Make noindirect a boolean.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
104888
diff
changeset
|
2612 Lisp_Object definition, this, last; |
cd8d62c35d57
* keymap.c (where_is_internal_data): Make noindirect a boolean.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
104888
diff
changeset
|
2613 int last_is_meta, noindirect; |
81792
4ee4f467ca51
(struct accessible_keymaps_data, struct where_is_internal_data): New structs.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
81609
diff
changeset
|
2614 Lisp_Object sequences; |
4ee4f467ca51
(struct accessible_keymaps_data, struct where_is_internal_data): New structs.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
81609
diff
changeset
|
2615 }; |
4ee4f467ca51
(struct accessible_keymaps_data, struct where_is_internal_data): New structs.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
81609
diff
changeset
|
2616 |
104918
cd8d62c35d57
* keymap.c (where_is_internal_data): Make noindirect a boolean.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
104888
diff
changeset
|
2617 /* This function can't GC, AFAIK. */ |
cd8d62c35d57
* keymap.c (where_is_internal_data): Make noindirect a boolean.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
104888
diff
changeset
|
2618 /* Return the list of bindings found. This list is ordered "longest |
cd8d62c35d57
* keymap.c (where_is_internal_data): Make noindirect a boolean.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
104888
diff
changeset
|
2619 to shortest". It may include bindings that are actually shadowed |
cd8d62c35d57
* keymap.c (where_is_internal_data): Make noindirect a boolean.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
104888
diff
changeset
|
2620 by others, as well as duplicate bindings and remapping bindings. |
cd8d62c35d57
* keymap.c (where_is_internal_data): Make noindirect a boolean.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
104888
diff
changeset
|
2621 The list returned is potentially shared with where_is_cache, so |
cd8d62c35d57
* keymap.c (where_is_internal_data): Make noindirect a boolean.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
104888
diff
changeset
|
2622 be careful not to modify it via side-effects. */ |
32846
c1b3ab2a1ccc
Use AREF, ASET and ASIZE macros.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
32844
diff
changeset
|
2623 |
32889
673e3ef1f7f6
(where_is_cache, where_is_cache_keymaps): New vars.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
32846
diff
changeset
|
2624 static Lisp_Object |
104918
cd8d62c35d57
* keymap.c (where_is_internal_data): Make noindirect a boolean.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
104888
diff
changeset
|
2625 where_is_internal (Lisp_Object definition, Lisp_Object keymaps, |
cd8d62c35d57
* keymap.c (where_is_internal_data): Make noindirect a boolean.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
104888
diff
changeset
|
2626 int noindirect, int nomenus) |
250 | 2627 { |
32846
c1b3ab2a1ccc
Use AREF, ASET and ASIZE macros.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
32844
diff
changeset
|
2628 Lisp_Object maps = Qnil; |
104918
cd8d62c35d57
* keymap.c (where_is_internal_data): Make noindirect a boolean.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
104888
diff
changeset
|
2629 Lisp_Object found; |
cd8d62c35d57
* keymap.c (where_is_internal_data): Make noindirect a boolean.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
104888
diff
changeset
|
2630 struct where_is_internal_data data; |
cd8d62c35d57
* keymap.c (where_is_internal_data): Make noindirect a boolean.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
104888
diff
changeset
|
2631 |
cd8d62c35d57
* keymap.c (where_is_internal_data): Make noindirect a boolean.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
104888
diff
changeset
|
2632 /* Only important use of caching is for the menubar |
cd8d62c35d57
* keymap.c (where_is_internal_data): Make noindirect a boolean.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
104888
diff
changeset
|
2633 (i.e. where-is-internal called with (def nil t nil nil)). */ |
cd8d62c35d57
* keymap.c (where_is_internal_data): Make noindirect a boolean.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
104888
diff
changeset
|
2634 if (nomenus && !noindirect) |
cd8d62c35d57
* keymap.c (where_is_internal_data): Make noindirect a boolean.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
104888
diff
changeset
|
2635 { |
cd8d62c35d57
* keymap.c (where_is_internal_data): Make noindirect a boolean.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
104888
diff
changeset
|
2636 /* Check heuristic-consistency of the cache. */ |
cd8d62c35d57
* keymap.c (where_is_internal_data): Make noindirect a boolean.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
104888
diff
changeset
|
2637 if (NILP (Fequal (keymaps, where_is_cache_keymaps))) |
cd8d62c35d57
* keymap.c (where_is_internal_data): Make noindirect a boolean.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
104888
diff
changeset
|
2638 where_is_cache = Qnil; |
cd8d62c35d57
* keymap.c (where_is_internal_data): Make noindirect a boolean.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
104888
diff
changeset
|
2639 |
cd8d62c35d57
* keymap.c (where_is_internal_data): Make noindirect a boolean.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
104888
diff
changeset
|
2640 if (NILP (where_is_cache)) |
cd8d62c35d57
* keymap.c (where_is_internal_data): Make noindirect a boolean.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
104888
diff
changeset
|
2641 { |
cd8d62c35d57
* keymap.c (where_is_internal_data): Make noindirect a boolean.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
104888
diff
changeset
|
2642 /* We need to create the cache. */ |
cd8d62c35d57
* keymap.c (where_is_internal_data): Make noindirect a boolean.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
104888
diff
changeset
|
2643 Lisp_Object args[2]; |
cd8d62c35d57
* keymap.c (where_is_internal_data): Make noindirect a boolean.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
104888
diff
changeset
|
2644 where_is_cache = Fmake_hash_table (0, args); |
cd8d62c35d57
* keymap.c (where_is_internal_data): Make noindirect a boolean.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
104888
diff
changeset
|
2645 where_is_cache_keymaps = Qt; |
cd8d62c35d57
* keymap.c (where_is_internal_data): Make noindirect a boolean.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
104888
diff
changeset
|
2646 } |
cd8d62c35d57
* keymap.c (where_is_internal_data): Make noindirect a boolean.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
104888
diff
changeset
|
2647 else |
cd8d62c35d57
* keymap.c (where_is_internal_data): Make noindirect a boolean.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
104888
diff
changeset
|
2648 /* We can reuse the cache. */ |
cd8d62c35d57
* keymap.c (where_is_internal_data): Make noindirect a boolean.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
104888
diff
changeset
|
2649 return Fgethash (definition, where_is_cache, Qnil); |
cd8d62c35d57
* keymap.c (where_is_internal_data): Make noindirect a boolean.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
104888
diff
changeset
|
2650 } |
cd8d62c35d57
* keymap.c (where_is_internal_data): Make noindirect a boolean.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
104888
diff
changeset
|
2651 else |
cd8d62c35d57
* keymap.c (where_is_internal_data): Make noindirect a boolean.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
104888
diff
changeset
|
2652 /* Kill the cache so that where_is_internal_1 doesn't think |
cd8d62c35d57
* keymap.c (where_is_internal_data): Make noindirect a boolean.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
104888
diff
changeset
|
2653 we're filling it up. */ |
cd8d62c35d57
* keymap.c (where_is_internal_data): Make noindirect a boolean.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
104888
diff
changeset
|
2654 where_is_cache = Qnil; |
250 | 2655 |
32846
c1b3ab2a1ccc
Use AREF, ASET and ASIZE macros.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
32844
diff
changeset
|
2656 found = keymaps; |
c1b3ab2a1ccc
Use AREF, ASET and ASIZE macros.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
32844
diff
changeset
|
2657 while (CONSP (found)) |
29282 | 2658 { |
32846
c1b3ab2a1ccc
Use AREF, ASET and ASIZE macros.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
32844
diff
changeset
|
2659 maps = |
32988
c3435dc00ed7
* lisp.h (KEYMAPP): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
32889
diff
changeset
|
2660 nconc2 (maps, |
c3435dc00ed7
* lisp.h (KEYMAPP): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
32889
diff
changeset
|
2661 Faccessible_keymaps (get_keymap (XCAR (found), 1, 0), Qnil)); |
32846
c1b3ab2a1ccc
Use AREF, ASET and ASIZE macros.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
32844
diff
changeset
|
2662 found = XCDR (found); |
29282 | 2663 } |
45279
220c13a65624
(keymap_parent): New fun, extracted from Fkeymap_parent.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
45235
diff
changeset
|
2664 |
104918
cd8d62c35d57
* keymap.c (where_is_internal_data): Make noindirect a boolean.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
104888
diff
changeset
|
2665 data.sequences = Qnil; |
85372
f7d19cfed7da
* xselect.c (x_own_selection, x_handle_selection_clear)
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
85106
diff
changeset
|
2666 for (; CONSP (maps); maps = XCDR (maps)) |
250 | 2667 { |
6502
18dfda644bc0
(access_keymap, store_in_keymap, Fcopy_keymap, Fdefine_key,
Karl Heuer <kwzh@gnu.org>
parents:
6475
diff
changeset
|
2668 /* Key sequence to reach map, and the map that it reaches */ |
50141
3770fda038d0
(Vmenu_events): New var.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49912
diff
changeset
|
2669 register Lisp_Object this, map, tem; |
1209
1aa2cd425737
* keymap.c (DENSE_TABLE_SIZE): Doc fix.
Jim Blandy <jimb@redhat.com>
parents:
1160
diff
changeset
|
2670 |
250 | 2671 /* In order to fold [META-PREFIX-CHAR CHAR] sequences into |
2672 [M-CHAR] sequences, check if last character of the sequence | |
2673 is the meta-prefix char. */ | |
6502
18dfda644bc0
(access_keymap, store_in_keymap, Fcopy_keymap, Fdefine_key,
Karl Heuer <kwzh@gnu.org>
parents:
6475
diff
changeset
|
2674 Lisp_Object last; |
18dfda644bc0
(access_keymap, store_in_keymap, Fcopy_keymap, Fdefine_key,
Karl Heuer <kwzh@gnu.org>
parents:
6475
diff
changeset
|
2675 int last_is_meta; |
18dfda644bc0
(access_keymap, store_in_keymap, Fcopy_keymap, Fdefine_key,
Karl Heuer <kwzh@gnu.org>
parents:
6475
diff
changeset
|
2676 |
85372
f7d19cfed7da
* xselect.c (x_own_selection, x_handle_selection_clear)
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
85106
diff
changeset
|
2677 this = Fcar (XCAR (maps)); |
f7d19cfed7da
* xselect.c (x_own_selection, x_handle_selection_clear)
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
85106
diff
changeset
|
2678 map = Fcdr (XCAR (maps)); |
6502
18dfda644bc0
(access_keymap, store_in_keymap, Fcopy_keymap, Fdefine_key,
Karl Heuer <kwzh@gnu.org>
parents:
6475
diff
changeset
|
2679 last = make_number (XINT (Flength (this)) - 1); |
18dfda644bc0
(access_keymap, store_in_keymap, Fcopy_keymap, Fdefine_key,
Karl Heuer <kwzh@gnu.org>
parents:
6475
diff
changeset
|
2680 last_is_meta = (XINT (last) >= 0 |
18dfda644bc0
(access_keymap, store_in_keymap, Fcopy_keymap, Fdefine_key,
Karl Heuer <kwzh@gnu.org>
parents:
6475
diff
changeset
|
2681 && EQ (Faref (this, last), meta_prefix_char)); |
250 | 2682 |
96747
ebf3bd5f0017
* keymap.c: Remove all NS-specific code.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
96675
diff
changeset
|
2683 /* if (nomenus && !preferred_sequence_p (this)) */ |
36405
7fe1b8d8fc44
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
36373
diff
changeset
|
2684 if (nomenus && XINT (last) >= 0 |
50141
3770fda038d0
(Vmenu_events): New var.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49912
diff
changeset
|
2685 && SYMBOLP (tem = Faref (this, make_number (0))) |
53808
aa6be081315b
(Vmouse_events): Rename from Vmenu_events.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
52740
diff
changeset
|
2686 && !NILP (Fmemq (XCAR (parse_modifiers (tem)), Vmouse_events))) |
34755
1e3d0f2d1145
(where_is_internal): Check ascii_sequence_p rather than
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
34515
diff
changeset
|
2687 /* If no menu entries should be returned, skip over the |
1e3d0f2d1145
(where_is_internal): Check ascii_sequence_p rather than
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
34515
diff
changeset
|
2688 keymaps bound to `menu-bar' and `tool-bar' and other |
36373
274190d289d7
(where_is_internal): Accept non-ascii integer prefixes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
35781
diff
changeset
|
2689 non-ascii prefixes like `C-down-mouse-2'. */ |
34755
1e3d0f2d1145
(where_is_internal): Check ascii_sequence_p rather than
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
34515
diff
changeset
|
2690 continue; |
45279
220c13a65624
(keymap_parent): New fun, extracted from Fkeymap_parent.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
45235
diff
changeset
|
2691 |
1236
5e8c234e5f03
* keymap.c (access_keymap): Remove code to notice bindings for
Jim Blandy <jimb@redhat.com>
parents:
1209
diff
changeset
|
2692 QUIT; |
5e8c234e5f03
* keymap.c (access_keymap): Remove code to notice bindings for
Jim Blandy <jimb@redhat.com>
parents:
1209
diff
changeset
|
2693 |
81792
4ee4f467ca51
(struct accessible_keymaps_data, struct where_is_internal_data): New structs.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
81609
diff
changeset
|
2694 data.definition = definition; |
4ee4f467ca51
(struct accessible_keymaps_data, struct where_is_internal_data): New structs.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
81609
diff
changeset
|
2695 data.noindirect = noindirect; |
4ee4f467ca51
(struct accessible_keymaps_data, struct where_is_internal_data): New structs.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
81609
diff
changeset
|
2696 data.this = this; |
4ee4f467ca51
(struct accessible_keymaps_data, struct where_is_internal_data): New structs.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
81609
diff
changeset
|
2697 data.last = last; |
4ee4f467ca51
(struct accessible_keymaps_data, struct where_is_internal_data): New structs.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
81609
diff
changeset
|
2698 data.last_is_meta = last_is_meta; |
4ee4f467ca51
(struct accessible_keymaps_data, struct where_is_internal_data): New structs.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
81609
diff
changeset
|
2699 |
4ee4f467ca51
(struct accessible_keymaps_data, struct where_is_internal_data): New structs.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
81609
diff
changeset
|
2700 if (CONSP (map)) |
4ee4f467ca51
(struct accessible_keymaps_data, struct where_is_internal_data): New structs.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
81609
diff
changeset
|
2701 map_keymap (map, where_is_internal_1, Qnil, &data, 0); |
250 | 2702 } |
2727
b8911c8b9700
* keymap.c (Fwhere_is_internal): If FIRSTONLY is non-nil, avoid
Jim Blandy <jimb@redhat.com>
parents:
2652
diff
changeset
|
2703 |
104918
cd8d62c35d57
* keymap.c (where_is_internal_data): Make noindirect a boolean.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
104888
diff
changeset
|
2704 if (nomenus && !noindirect) |
104936
4556ab401b02
(where_is_internal): Don't erroneously return nil right after
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
104925
diff
changeset
|
2705 { /* Remember for which keymaps this cache was built. |
4556ab401b02
(where_is_internal): Don't erroneously return nil right after
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
104925
diff
changeset
|
2706 We do it here (late) because we want to keep where_is_cache_keymaps |
4556ab401b02
(where_is_internal): Don't erroneously return nil right after
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
104925
diff
changeset
|
2707 set to t while the cache isn't fully filled. */ |
4556ab401b02
(where_is_internal): Don't erroneously return nil right after
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
104925
diff
changeset
|
2708 where_is_cache_keymaps = keymaps; |
4556ab401b02
(where_is_internal): Don't erroneously return nil right after
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
104925
diff
changeset
|
2709 /* During cache-filling, data.sequences is not filled by |
4556ab401b02
(where_is_internal): Don't erroneously return nil right after
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
104925
diff
changeset
|
2710 where_is_internal_1. */ |
4556ab401b02
(where_is_internal): Don't erroneously return nil right after
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
104925
diff
changeset
|
2711 return Fgethash (definition, where_is_cache, Qnil); |
4556ab401b02
(where_is_internal): Don't erroneously return nil right after
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
104925
diff
changeset
|
2712 } |
4556ab401b02
(where_is_internal): Don't erroneously return nil right after
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
104925
diff
changeset
|
2713 else |
4556ab401b02
(where_is_internal): Don't erroneously return nil right after
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
104925
diff
changeset
|
2714 return data.sequences; |
250 | 2715 } |
17788
208d71ea3a4f
(get_keyelt): Handle an indirect entry with meta char.
Richard M. Stallman <rms@gnu.org>
parents:
17511
diff
changeset
|
2716 |
96747
ebf3bd5f0017
* keymap.c: Remove all NS-specific code.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
96675
diff
changeset
|
2717 static Lisp_Object Vwhere_is_preferred_modifier; |
ebf3bd5f0017
* keymap.c: Remove all NS-specific code.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
96675
diff
changeset
|
2718 |
104918
cd8d62c35d57
* keymap.c (where_is_internal_data): Make noindirect a boolean.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
104888
diff
changeset
|
2719 /* This function can GC if Flookup_key autoloads any keymaps. */ |
cd8d62c35d57
* keymap.c (where_is_internal_data): Make noindirect a boolean.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
104888
diff
changeset
|
2720 |
43152
0029b0259426
(Fdefine_key): Allow symbol as KEY argument for
Kim F. Storm <storm@cua.dk>
parents:
42510
diff
changeset
|
2721 DEFUN ("where-is-internal", Fwhere_is_internal, Swhere_is_internal, 1, 5, 0, |
41001
a17c8b15ef1b
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
40804
diff
changeset
|
2722 doc: /* Return list of keys that invoke DEFINITION. |
56635
a8be0bc345d2
(Fmake_keymap, Fmap_keymap, Fwhere_is_internal): Doc fixes.
Luc Teirlinck <teirllm@auburn.edu>
parents:
56618
diff
changeset
|
2723 If KEYMAP is a keymap, search only KEYMAP and the global keymap. |
41001
a17c8b15ef1b
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
40804
diff
changeset
|
2724 If KEYMAP is nil, search all the currently active keymaps. |
a17c8b15ef1b
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
40804
diff
changeset
|
2725 If KEYMAP is a list of keymaps, search only those keymaps. |
a17c8b15ef1b
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
40804
diff
changeset
|
2726 |
a17c8b15ef1b
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
40804
diff
changeset
|
2727 If optional 3rd arg FIRSTONLY is non-nil, return the first key sequence found, |
a17c8b15ef1b
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
40804
diff
changeset
|
2728 rather than a list of all possible key sequences. |
a17c8b15ef1b
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
40804
diff
changeset
|
2729 If FIRSTONLY is the symbol `non-ascii', return the first binding found, |
a17c8b15ef1b
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
40804
diff
changeset
|
2730 no matter what it is. |
96747
ebf3bd5f0017
* keymap.c: Remove all NS-specific code.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
96675
diff
changeset
|
2731 If FIRSTONLY has another non-nil value, prefer bindings |
ebf3bd5f0017
* keymap.c: Remove all NS-specific code.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
96675
diff
changeset
|
2732 that use the modifier key specified in `where-is-preferred-modifier' |
56635
a8be0bc345d2
(Fmake_keymap, Fmap_keymap, Fwhere_is_internal): Doc fixes.
Luc Teirlinck <teirllm@auburn.edu>
parents:
56618
diff
changeset
|
2733 \(or their meta variants) and entirely reject menu bindings. |
41001
a17c8b15ef1b
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
40804
diff
changeset
|
2734 |
a17c8b15ef1b
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
40804
diff
changeset
|
2735 If optional 4th arg NOINDIRECT is non-nil, don't follow indirections |
a17c8b15ef1b
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
40804
diff
changeset
|
2736 to other keymaps or slots. This makes it possible to search for an |
43152
0029b0259426
(Fdefine_key): Allow symbol as KEY argument for
Kim F. Storm <storm@cua.dk>
parents:
42510
diff
changeset
|
2737 indirect definition itself. |
0029b0259426
(Fdefine_key): Allow symbol as KEY argument for
Kim F. Storm <storm@cua.dk>
parents:
42510
diff
changeset
|
2738 |
0029b0259426
(Fdefine_key): Allow symbol as KEY argument for
Kim F. Storm <storm@cua.dk>
parents:
42510
diff
changeset
|
2739 If optional 5th arg NO-REMAP is non-nil, don't search for key sequences |
0029b0259426
(Fdefine_key): Allow symbol as KEY argument for
Kim F. Storm <storm@cua.dk>
parents:
42510
diff
changeset
|
2740 that invoke a command which is remapped to DEFINITION, but include the |
0029b0259426
(Fdefine_key): Allow symbol as KEY argument for
Kim F. Storm <storm@cua.dk>
parents:
42510
diff
changeset
|
2741 remapped command in the returned list. */) |
109179
8cfee7d2955f
Convert DEFUNs to standard C.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
109165
diff
changeset
|
2742 (Lisp_Object definition, Lisp_Object keymap, Lisp_Object firstonly, Lisp_Object noindirect, Lisp_Object no_remap) |
32889
673e3ef1f7f6
(where_is_cache, where_is_cache_keymaps): New vars.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
32846
diff
changeset
|
2743 { |
104918
cd8d62c35d57
* keymap.c (where_is_internal_data): Make noindirect a boolean.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
104888
diff
changeset
|
2744 /* The keymaps in which to search. */ |
cd8d62c35d57
* keymap.c (where_is_internal_data): Make noindirect a boolean.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
104888
diff
changeset
|
2745 Lisp_Object keymaps; |
cd8d62c35d57
* keymap.c (where_is_internal_data): Make noindirect a boolean.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
104888
diff
changeset
|
2746 /* Potentially relevant bindings in "shortest to longest" order. */ |
104919
ad7987e70109
(Fwhere_is_internal): Last minute typo.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
104918
diff
changeset
|
2747 Lisp_Object sequences = Qnil; |
104918
cd8d62c35d57
* keymap.c (where_is_internal_data): Make noindirect a boolean.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
104888
diff
changeset
|
2748 /* Actually relevant bindings. */ |
cd8d62c35d57
* keymap.c (where_is_internal_data): Make noindirect a boolean.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
104888
diff
changeset
|
2749 Lisp_Object found = Qnil; |
32889
673e3ef1f7f6
(where_is_cache, where_is_cache_keymaps): New vars.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
32846
diff
changeset
|
2750 /* 1 means ignore all menu bindings entirely. */ |
673e3ef1f7f6
(where_is_cache, where_is_cache_keymaps): New vars.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
32846
diff
changeset
|
2751 int nomenus = !NILP (firstonly) && !EQ (firstonly, Qnon_ascii); |
108678
46728260f484
* src/keymap.c (Fwhere_is_internal): Fix handling of remapping (in thread
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107332
diff
changeset
|
2752 struct gcpro gcpro1, gcpro2, gcpro3, gcpro4, gcpro5, gcpro6; |
104918
cd8d62c35d57
* keymap.c (where_is_internal_data): Make noindirect a boolean.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
104888
diff
changeset
|
2753 /* List of sequences found via remapping. Keep them in a separate |
cd8d62c35d57
* keymap.c (where_is_internal_data): Make noindirect a boolean.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
104888
diff
changeset
|
2754 variable, so as to push them later, since we prefer |
cd8d62c35d57
* keymap.c (where_is_internal_data): Make noindirect a boolean.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
104888
diff
changeset
|
2755 non-remapped binding. */ |
cd8d62c35d57
* keymap.c (where_is_internal_data): Make noindirect a boolean.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
104888
diff
changeset
|
2756 Lisp_Object remapped_sequences = Qnil; |
cd8d62c35d57
* keymap.c (where_is_internal_data): Make noindirect a boolean.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
104888
diff
changeset
|
2757 /* Whether or not we're handling remapped sequences. This is needed |
cd8d62c35d57
* keymap.c (where_is_internal_data): Make noindirect a boolean.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
104888
diff
changeset
|
2758 because remapping is not done recursively by Fcommand_remapping: you |
108678
46728260f484
* src/keymap.c (Fwhere_is_internal): Fix handling of remapping (in thread
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107332
diff
changeset
|
2759 can't remap a remapped command. */ |
104918
cd8d62c35d57
* keymap.c (where_is_internal_data): Make noindirect a boolean.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
104888
diff
changeset
|
2760 int remapped = 0; |
108678
46728260f484
* src/keymap.c (Fwhere_is_internal): Fix handling of remapping (in thread
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107332
diff
changeset
|
2761 Lisp_Object tem = Qnil; |
32889
673e3ef1f7f6
(where_is_cache, where_is_cache_keymaps): New vars.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
32846
diff
changeset
|
2762 |
96747
ebf3bd5f0017
* keymap.c: Remove all NS-specific code.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
96675
diff
changeset
|
2763 /* Refresh the C version of the modifier preference. */ |
ebf3bd5f0017
* keymap.c: Remove all NS-specific code.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
96675
diff
changeset
|
2764 where_is_preferred_modifier |
ebf3bd5f0017
* keymap.c: Remove all NS-specific code.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
96675
diff
changeset
|
2765 = parse_solitary_modifier (Vwhere_is_preferred_modifier); |
ebf3bd5f0017
* keymap.c: Remove all NS-specific code.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
96675
diff
changeset
|
2766 |
32889
673e3ef1f7f6
(where_is_cache, where_is_cache_keymaps): New vars.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
32846
diff
changeset
|
2767 /* Find the relevant keymaps. */ |
35258
f585b46c055a
Call get_local_map with new argument list.
Gerd Moellmann <gerd@gnu.org>
parents:
34906
diff
changeset
|
2768 if (CONSP (keymap) && KEYMAPP (XCAR (keymap))) |
f585b46c055a
Call get_local_map with new argument list.
Gerd Moellmann <gerd@gnu.org>
parents:
34906
diff
changeset
|
2769 keymaps = keymap; |
39689
0572449a62be
(Fkeymap_prompt, Fcurrent_active_maps): New funs.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
39682
diff
changeset
|
2770 else if (!NILP (keymap)) |
35258
f585b46c055a
Call get_local_map with new argument list.
Gerd Moellmann <gerd@gnu.org>
parents:
34906
diff
changeset
|
2771 keymaps = Fcons (keymap, Fcons (current_global_map, Qnil)); |
32889
673e3ef1f7f6
(where_is_cache, where_is_cache_keymaps): New vars.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
32846
diff
changeset
|
2772 else |
81609
7e640eac2dcb
* keymaps.texi (Active Keymaps): Document new POSITION argument of
David Kastrup <dak@gnu.org>
parents:
81281
diff
changeset
|
2773 keymaps = Fcurrent_active_maps (Qnil, Qnil); |
32889
673e3ef1f7f6
(where_is_cache, where_is_cache_keymaps): New vars.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
32846
diff
changeset
|
2774 |
108678
46728260f484
* src/keymap.c (Fwhere_is_internal): Fix handling of remapping (in thread
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107332
diff
changeset
|
2775 GCPRO6 (definition, keymaps, found, sequences, remapped_sequences, tem); |
46728260f484
* src/keymap.c (Fwhere_is_internal): Fix handling of remapping (in thread
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107332
diff
changeset
|
2776 |
46728260f484
* src/keymap.c (Fwhere_is_internal): Fix handling of remapping (in thread
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107332
diff
changeset
|
2777 tem = Fcommand_remapping (definition, Qnil, keymaps); |
46728260f484
* src/keymap.c (Fwhere_is_internal): Fix handling of remapping (in thread
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107332
diff
changeset
|
2778 /* If `definition' is remapped to tem', then OT1H no key will run |
46728260f484
* src/keymap.c (Fwhere_is_internal): Fix handling of remapping (in thread
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107332
diff
changeset
|
2779 that command (since they will run `tem' instead), so we should |
46728260f484
* src/keymap.c (Fwhere_is_internal): Fix handling of remapping (in thread
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107332
diff
changeset
|
2780 return nil; but OTOH all keys bound to `definition' (or to `tem') |
46728260f484
* src/keymap.c (Fwhere_is_internal): Fix handling of remapping (in thread
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107332
diff
changeset
|
2781 will run the same command. |
46728260f484
* src/keymap.c (Fwhere_is_internal): Fix handling of remapping (in thread
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107332
diff
changeset
|
2782 So for menu-shortcut purposes, we want to find all the keys bound (maybe |
46728260f484
* src/keymap.c (Fwhere_is_internal): Fix handling of remapping (in thread
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107332
diff
changeset
|
2783 via remapping) to `tem'. But for the purpose of finding the keys that |
46728260f484
* src/keymap.c (Fwhere_is_internal): Fix handling of remapping (in thread
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107332
diff
changeset
|
2784 run `definition', then we'd want to just return nil. |
46728260f484
* src/keymap.c (Fwhere_is_internal): Fix handling of remapping (in thread
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107332
diff
changeset
|
2785 We choose to make it work right for menu-shortcuts, since it's the most |
46728260f484
* src/keymap.c (Fwhere_is_internal): Fix handling of remapping (in thread
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107332
diff
changeset
|
2786 common use. |
46728260f484
* src/keymap.c (Fwhere_is_internal): Fix handling of remapping (in thread
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107332
diff
changeset
|
2787 Known bugs: if you remap switch-to-buffer to toto, C-h f switch-to-buffer |
46728260f484
* src/keymap.c (Fwhere_is_internal): Fix handling of remapping (in thread
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107332
diff
changeset
|
2788 will tell you that switch-to-buffer is bound to C-x b even though C-x b |
46728260f484
* src/keymap.c (Fwhere_is_internal): Fix handling of remapping (in thread
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107332
diff
changeset
|
2789 will run toto instead. And if `toto' is itself remapped to forward-char, |
46728260f484
* src/keymap.c (Fwhere_is_internal): Fix handling of remapping (in thread
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107332
diff
changeset
|
2790 then C-h f toto will tell you that it's bound to C-f even though C-f does |
46728260f484
* src/keymap.c (Fwhere_is_internal): Fix handling of remapping (in thread
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107332
diff
changeset
|
2791 not run toto and it won't tell you that C-x b does run toto. */ |
46728260f484
* src/keymap.c (Fwhere_is_internal): Fix handling of remapping (in thread
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107332
diff
changeset
|
2792 if (NILP (no_remap) && !NILP (tem)) |
46728260f484
* src/keymap.c (Fwhere_is_internal): Fix handling of remapping (in thread
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107332
diff
changeset
|
2793 definition = tem; |
104918
cd8d62c35d57
* keymap.c (where_is_internal_data): Make noindirect a boolean.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
104888
diff
changeset
|
2794 |
104922
c603ee2aac17
* keymap.c (QCadvertised_binding): New constant.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
104919
diff
changeset
|
2795 if (SYMBOLP (definition) |
c603ee2aac17
* keymap.c (QCadvertised_binding): New constant.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
104919
diff
changeset
|
2796 && !NILP (firstonly) |
c603ee2aac17
* keymap.c (QCadvertised_binding): New constant.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
104919
diff
changeset
|
2797 && !NILP (tem = Fget (definition, QCadvertised_binding))) |
c603ee2aac17
* keymap.c (QCadvertised_binding): New constant.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
104919
diff
changeset
|
2798 { |
c603ee2aac17
* keymap.c (QCadvertised_binding): New constant.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
104919
diff
changeset
|
2799 /* We have a list of advertized bindings. */ |
c603ee2aac17
* keymap.c (QCadvertised_binding): New constant.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
104919
diff
changeset
|
2800 while (CONSP (tem)) |
106972
d026329addd9
* keymap.c (shadow_lookup): Add `remap' arg.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
106815
diff
changeset
|
2801 if (EQ (shadow_lookup (keymaps, XCAR (tem), Qnil, 0), definition)) |
104922
c603ee2aac17
* keymap.c (QCadvertised_binding): New constant.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
104919
diff
changeset
|
2802 return XCAR (tem); |
c603ee2aac17
* keymap.c (QCadvertised_binding): New constant.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
104919
diff
changeset
|
2803 else |
c603ee2aac17
* keymap.c (QCadvertised_binding): New constant.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
104919
diff
changeset
|
2804 tem = XCDR (tem); |
106972
d026329addd9
* keymap.c (shadow_lookup): Add `remap' arg.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
106815
diff
changeset
|
2805 if (EQ (shadow_lookup (keymaps, tem, Qnil, 0), definition)) |
104922
c603ee2aac17
* keymap.c (QCadvertised_binding): New constant.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
104919
diff
changeset
|
2806 return tem; |
c603ee2aac17
* keymap.c (QCadvertised_binding): New constant.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
104919
diff
changeset
|
2807 } |
c603ee2aac17
* keymap.c (QCadvertised_binding): New constant.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
104919
diff
changeset
|
2808 |
104918
cd8d62c35d57
* keymap.c (where_is_internal_data): Make noindirect a boolean.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
104888
diff
changeset
|
2809 sequences = Freverse (where_is_internal (definition, keymaps, |
cd8d62c35d57
* keymap.c (where_is_internal_data): Make noindirect a boolean.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
104888
diff
changeset
|
2810 !NILP (noindirect), nomenus)); |
cd8d62c35d57
* keymap.c (where_is_internal_data): Make noindirect a boolean.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
104888
diff
changeset
|
2811 |
106972
d026329addd9
* keymap.c (shadow_lookup): Add `remap' arg.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
106815
diff
changeset
|
2812 while (CONSP (sequences) |
d026329addd9
* keymap.c (shadow_lookup): Add `remap' arg.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
106815
diff
changeset
|
2813 /* If we're at the end of the `sequences' list and we haven't |
d026329addd9
* keymap.c (shadow_lookup): Add `remap' arg.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
106815
diff
changeset
|
2814 considered remapped sequences yet, copy them over and |
d026329addd9
* keymap.c (shadow_lookup): Add `remap' arg.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
106815
diff
changeset
|
2815 process them. */ |
d026329addd9
* keymap.c (shadow_lookup): Add `remap' arg.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
106815
diff
changeset
|
2816 || (!remapped && (sequences = remapped_sequences, |
d026329addd9
* keymap.c (shadow_lookup): Add `remap' arg.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
106815
diff
changeset
|
2817 remapped = 1), |
d026329addd9
* keymap.c (shadow_lookup): Add `remap' arg.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
106815
diff
changeset
|
2818 CONSP (sequences))) |
32889
673e3ef1f7f6
(where_is_cache, where_is_cache_keymaps): New vars.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
32846
diff
changeset
|
2819 { |
104918
cd8d62c35d57
* keymap.c (where_is_internal_data): Make noindirect a boolean.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
104888
diff
changeset
|
2820 Lisp_Object sequence, function; |
107332
e09a216f2aab
Fix keyboard macro key lookup (Bug#5481).
Chong Yidong <cyd@stupidchicken.com>
parents:
106972
diff
changeset
|
2821 |
104918
cd8d62c35d57
* keymap.c (where_is_internal_data): Make noindirect a boolean.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
104888
diff
changeset
|
2822 sequence = XCAR (sequences); |
cd8d62c35d57
* keymap.c (where_is_internal_data): Make noindirect a boolean.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
104888
diff
changeset
|
2823 sequences = XCDR (sequences); |
cd8d62c35d57
* keymap.c (where_is_internal_data): Make noindirect a boolean.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
104888
diff
changeset
|
2824 |
cd8d62c35d57
* keymap.c (where_is_internal_data): Make noindirect a boolean.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
104888
diff
changeset
|
2825 /* Verify that this key binding is not shadowed by another |
cd8d62c35d57
* keymap.c (where_is_internal_data): Make noindirect a boolean.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
104888
diff
changeset
|
2826 binding for the same key, before we say it exists. |
cd8d62c35d57
* keymap.c (where_is_internal_data): Make noindirect a boolean.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
104888
diff
changeset
|
2827 |
cd8d62c35d57
* keymap.c (where_is_internal_data): Make noindirect a boolean.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
104888
diff
changeset
|
2828 Mechanism: look for local definition of this key and if |
cd8d62c35d57
* keymap.c (where_is_internal_data): Make noindirect a boolean.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
104888
diff
changeset
|
2829 it is defined and does not match what we found then |
cd8d62c35d57
* keymap.c (where_is_internal_data): Make noindirect a boolean.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
104888
diff
changeset
|
2830 ignore this key. |
cd8d62c35d57
* keymap.c (where_is_internal_data): Make noindirect a boolean.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
104888
diff
changeset
|
2831 |
cd8d62c35d57
* keymap.c (where_is_internal_data): Make noindirect a boolean.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
104888
diff
changeset
|
2832 Either nil or number as value from Flookup_key |
cd8d62c35d57
* keymap.c (where_is_internal_data): Make noindirect a boolean.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
104888
diff
changeset
|
2833 means undefined. */ |
107332
e09a216f2aab
Fix keyboard macro key lookup (Bug#5481).
Chong Yidong <cyd@stupidchicken.com>
parents:
106972
diff
changeset
|
2834 if (NILP (Fequal (shadow_lookup (keymaps, sequence, Qnil, remapped), |
e09a216f2aab
Fix keyboard macro key lookup (Bug#5481).
Chong Yidong <cyd@stupidchicken.com>
parents:
106972
diff
changeset
|
2835 definition))) |
104918
cd8d62c35d57
* keymap.c (where_is_internal_data): Make noindirect a boolean.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
104888
diff
changeset
|
2836 continue; |
cd8d62c35d57
* keymap.c (where_is_internal_data): Make noindirect a boolean.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
104888
diff
changeset
|
2837 |
cd8d62c35d57
* keymap.c (where_is_internal_data): Make noindirect a boolean.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
104888
diff
changeset
|
2838 /* If the current sequence is a command remapping with |
cd8d62c35d57
* keymap.c (where_is_internal_data): Make noindirect a boolean.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
104888
diff
changeset
|
2839 format [remap COMMAND], find the key sequences |
cd8d62c35d57
* keymap.c (where_is_internal_data): Make noindirect a boolean.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
104888
diff
changeset
|
2840 which run COMMAND, and use those sequences instead. */ |
cd8d62c35d57
* keymap.c (where_is_internal_data): Make noindirect a boolean.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
104888
diff
changeset
|
2841 if (NILP (no_remap) && !remapped |
cd8d62c35d57
* keymap.c (where_is_internal_data): Make noindirect a boolean.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
104888
diff
changeset
|
2842 && VECTORP (sequence) && ASIZE (sequence) == 2 |
cd8d62c35d57
* keymap.c (where_is_internal_data): Make noindirect a boolean.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
104888
diff
changeset
|
2843 && EQ (AREF (sequence, 0), Qremap) |
cd8d62c35d57
* keymap.c (where_is_internal_data): Make noindirect a boolean.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
104888
diff
changeset
|
2844 && (function = AREF (sequence, 1), SYMBOLP (function))) |
cd8d62c35d57
* keymap.c (where_is_internal_data): Make noindirect a boolean.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
104888
diff
changeset
|
2845 { |
cd8d62c35d57
* keymap.c (where_is_internal_data): Make noindirect a boolean.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
104888
diff
changeset
|
2846 Lisp_Object seqs = where_is_internal (function, keymaps, |
cd8d62c35d57
* keymap.c (where_is_internal_data): Make noindirect a boolean.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
104888
diff
changeset
|
2847 !NILP (noindirect), nomenus); |
104971
32f634736979
(Fwhere_is_internal): Use nconc2.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
104936
diff
changeset
|
2848 remapped_sequences = nconc2 (Freverse (seqs), remapped_sequences); |
104918
cd8d62c35d57
* keymap.c (where_is_internal_data): Make noindirect a boolean.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
104888
diff
changeset
|
2849 continue; |
cd8d62c35d57
* keymap.c (where_is_internal_data): Make noindirect a boolean.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
104888
diff
changeset
|
2850 } |
cd8d62c35d57
* keymap.c (where_is_internal_data): Make noindirect a boolean.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
104888
diff
changeset
|
2851 |
cd8d62c35d57
* keymap.c (where_is_internal_data): Make noindirect a boolean.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
104888
diff
changeset
|
2852 /* Don't annoy user with strings from a menu such as the |
cd8d62c35d57
* keymap.c (where_is_internal_data): Make noindirect a boolean.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
104888
diff
changeset
|
2853 entries from the "Edit => Paste from Kill Menu". |
cd8d62c35d57
* keymap.c (where_is_internal_data): Make noindirect a boolean.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
104888
diff
changeset
|
2854 Change them all to "(any string)", so that there |
cd8d62c35d57
* keymap.c (where_is_internal_data): Make noindirect a boolean.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
104888
diff
changeset
|
2855 seems to be only one menu item to report. */ |
cd8d62c35d57
* keymap.c (where_is_internal_data): Make noindirect a boolean.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
104888
diff
changeset
|
2856 if (! NILP (sequence)) |
cd8d62c35d57
* keymap.c (where_is_internal_data): Make noindirect a boolean.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
104888
diff
changeset
|
2857 { |
cd8d62c35d57
* keymap.c (where_is_internal_data): Make noindirect a boolean.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
104888
diff
changeset
|
2858 Lisp_Object tem; |
cd8d62c35d57
* keymap.c (where_is_internal_data): Make noindirect a boolean.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
104888
diff
changeset
|
2859 tem = Faref (sequence, make_number (ASIZE (sequence) - 1)); |
cd8d62c35d57
* keymap.c (where_is_internal_data): Make noindirect a boolean.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
104888
diff
changeset
|
2860 if (STRINGP (tem)) |
cd8d62c35d57
* keymap.c (where_is_internal_data): Make noindirect a boolean.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
104888
diff
changeset
|
2861 Faset (sequence, make_number (ASIZE (sequence) - 1), |
cd8d62c35d57
* keymap.c (where_is_internal_data): Make noindirect a boolean.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
104888
diff
changeset
|
2862 build_string ("(any string)")); |
cd8d62c35d57
* keymap.c (where_is_internal_data): Make noindirect a boolean.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
104888
diff
changeset
|
2863 } |
107332
e09a216f2aab
Fix keyboard macro key lookup (Bug#5481).
Chong Yidong <cyd@stupidchicken.com>
parents:
106972
diff
changeset
|
2864 |
104918
cd8d62c35d57
* keymap.c (where_is_internal_data): Make noindirect a boolean.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
104888
diff
changeset
|
2865 /* It is a true unshadowed match. Record it, unless it's already |
cd8d62c35d57
* keymap.c (where_is_internal_data): Make noindirect a boolean.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
104888
diff
changeset
|
2866 been seen (as could happen when inheriting keymaps). */ |
cd8d62c35d57
* keymap.c (where_is_internal_data): Make noindirect a boolean.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
104888
diff
changeset
|
2867 if (NILP (Fmember (sequence, found))) |
cd8d62c35d57
* keymap.c (where_is_internal_data): Make noindirect a boolean.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
104888
diff
changeset
|
2868 found = Fcons (sequence, found); |
107332
e09a216f2aab
Fix keyboard macro key lookup (Bug#5481).
Chong Yidong <cyd@stupidchicken.com>
parents:
106972
diff
changeset
|
2869 |
104918
cd8d62c35d57
* keymap.c (where_is_internal_data): Make noindirect a boolean.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
104888
diff
changeset
|
2870 /* If firstonly is Qnon_ascii, then we can return the first |
cd8d62c35d57
* keymap.c (where_is_internal_data): Make noindirect a boolean.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
104888
diff
changeset
|
2871 binding we find. If firstonly is not Qnon_ascii but not |
cd8d62c35d57
* keymap.c (where_is_internal_data): Make noindirect a boolean.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
104888
diff
changeset
|
2872 nil, then we should return the first ascii-only binding |
cd8d62c35d57
* keymap.c (where_is_internal_data): Make noindirect a boolean.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
104888
diff
changeset
|
2873 we find. */ |
cd8d62c35d57
* keymap.c (where_is_internal_data): Make noindirect a boolean.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
104888
diff
changeset
|
2874 if (EQ (firstonly, Qnon_ascii)) |
cd8d62c35d57
* keymap.c (where_is_internal_data): Make noindirect a boolean.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
104888
diff
changeset
|
2875 RETURN_UNGCPRO (sequence); |
cd8d62c35d57
* keymap.c (where_is_internal_data): Make noindirect a boolean.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
104888
diff
changeset
|
2876 else if (!NILP (firstonly) |
cd8d62c35d57
* keymap.c (where_is_internal_data): Make noindirect a boolean.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
104888
diff
changeset
|
2877 && 2 == preferred_sequence_p (sequence)) |
cd8d62c35d57
* keymap.c (where_is_internal_data): Make noindirect a boolean.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
104888
diff
changeset
|
2878 RETURN_UNGCPRO (sequence); |
32889
673e3ef1f7f6
(where_is_cache, where_is_cache_keymaps): New vars.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
32846
diff
changeset
|
2879 } |
104918
cd8d62c35d57
* keymap.c (where_is_internal_data): Make noindirect a boolean.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
104888
diff
changeset
|
2880 |
cd8d62c35d57
* keymap.c (where_is_internal_data): Make noindirect a boolean.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
104888
diff
changeset
|
2881 UNGCPRO; |
cd8d62c35d57
* keymap.c (where_is_internal_data): Make noindirect a boolean.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
104888
diff
changeset
|
2882 |
cd8d62c35d57
* keymap.c (where_is_internal_data): Make noindirect a boolean.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
104888
diff
changeset
|
2883 found = Fnreverse (found); |
cd8d62c35d57
* keymap.c (where_is_internal_data): Make noindirect a boolean.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
104888
diff
changeset
|
2884 |
cd8d62c35d57
* keymap.c (where_is_internal_data): Make noindirect a boolean.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
104888
diff
changeset
|
2885 /* firstonly may have been t, but we may have gone all the way through |
cd8d62c35d57
* keymap.c (where_is_internal_data): Make noindirect a boolean.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
104888
diff
changeset
|
2886 the keymaps without finding an all-ASCII key sequence. So just |
cd8d62c35d57
* keymap.c (where_is_internal_data): Make noindirect a boolean.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
104888
diff
changeset
|
2887 return the best we could find. */ |
cd8d62c35d57
* keymap.c (where_is_internal_data): Make noindirect a boolean.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
104888
diff
changeset
|
2888 if (NILP (firstonly)) |
cd8d62c35d57
* keymap.c (where_is_internal_data): Make noindirect a boolean.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
104888
diff
changeset
|
2889 return found; |
cd8d62c35d57
* keymap.c (where_is_internal_data): Make noindirect a boolean.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
104888
diff
changeset
|
2890 else if (where_is_preferred_modifier == 0) |
cd8d62c35d57
* keymap.c (where_is_internal_data): Make noindirect a boolean.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
104888
diff
changeset
|
2891 return Fcar (found); |
32889
673e3ef1f7f6
(where_is_cache, where_is_cache_keymaps): New vars.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
32846
diff
changeset
|
2892 else |
104918
cd8d62c35d57
* keymap.c (where_is_internal_data): Make noindirect a boolean.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
104888
diff
changeset
|
2893 { /* Maybe we did not find a preferred_modifier binding, but we did find |
cd8d62c35d57
* keymap.c (where_is_internal_data): Make noindirect a boolean.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
104888
diff
changeset
|
2894 some ASCII binding. */ |
cd8d62c35d57
* keymap.c (where_is_internal_data): Make noindirect a boolean.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
104888
diff
changeset
|
2895 Lisp_Object bindings = found; |
cd8d62c35d57
* keymap.c (where_is_internal_data): Make noindirect a boolean.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
104888
diff
changeset
|
2896 while (CONSP (bindings)) |
cd8d62c35d57
* keymap.c (where_is_internal_data): Make noindirect a boolean.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
104888
diff
changeset
|
2897 if (preferred_sequence_p (XCAR (bindings))) |
cd8d62c35d57
* keymap.c (where_is_internal_data): Make noindirect a boolean.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
104888
diff
changeset
|
2898 return XCAR (bindings); |
cd8d62c35d57
* keymap.c (where_is_internal_data): Make noindirect a boolean.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
104888
diff
changeset
|
2899 else |
cd8d62c35d57
* keymap.c (where_is_internal_data): Make noindirect a boolean.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
104888
diff
changeset
|
2900 bindings = XCDR (bindings); |
cd8d62c35d57
* keymap.c (where_is_internal_data): Make noindirect a boolean.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
104888
diff
changeset
|
2901 return Fcar (found); |
32889
673e3ef1f7f6
(where_is_cache, where_is_cache_keymaps): New vars.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
32846
diff
changeset
|
2902 } |
673e3ef1f7f6
(where_is_cache, where_is_cache_keymaps): New vars.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
32846
diff
changeset
|
2903 } |
673e3ef1f7f6
(where_is_cache, where_is_cache_keymaps): New vars.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
32846
diff
changeset
|
2904 |
81792
4ee4f467ca51
(struct accessible_keymaps_data, struct where_is_internal_data): New structs.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
81609
diff
changeset
|
2905 /* This function can GC because get_keyelt can. */ |
17788
208d71ea3a4f
(get_keyelt): Handle an indirect entry with meta char.
Richard M. Stallman <rms@gnu.org>
parents:
17511
diff
changeset
|
2906 |
20319
81424cf4d446
(copy_keymap_1): Fix return type.
Andreas Schwab <schwab@suse.de>
parents:
20076
diff
changeset
|
2907 static void |
109126
aec1143e8d85
Convert (most) functions in src to standard C.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
109100
diff
changeset
|
2908 where_is_internal_1 (Lisp_Object key, Lisp_Object binding, Lisp_Object args, void *data) |
17788
208d71ea3a4f
(get_keyelt): Handle an indirect entry with meta char.
Richard M. Stallman <rms@gnu.org>
parents:
17511
diff
changeset
|
2909 { |
81792
4ee4f467ca51
(struct accessible_keymaps_data, struct where_is_internal_data): New structs.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
81609
diff
changeset
|
2910 struct where_is_internal_data *d = data; /* Cast! */ |
4ee4f467ca51
(struct accessible_keymaps_data, struct where_is_internal_data): New structs.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
81609
diff
changeset
|
2911 Lisp_Object definition = d->definition; |
104918
cd8d62c35d57
* keymap.c (where_is_internal_data): Make noindirect a boolean.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
104888
diff
changeset
|
2912 int noindirect = d->noindirect; |
81792
4ee4f467ca51
(struct accessible_keymaps_data, struct where_is_internal_data): New structs.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
81609
diff
changeset
|
2913 Lisp_Object this = d->this; |
4ee4f467ca51
(struct accessible_keymaps_data, struct where_is_internal_data): New structs.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
81609
diff
changeset
|
2914 Lisp_Object last = d->last; |
4ee4f467ca51
(struct accessible_keymaps_data, struct where_is_internal_data): New structs.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
81609
diff
changeset
|
2915 int last_is_meta = d->last_is_meta; |
17788
208d71ea3a4f
(get_keyelt): Handle an indirect entry with meta char.
Richard M. Stallman <rms@gnu.org>
parents:
17511
diff
changeset
|
2916 Lisp_Object sequence; |
208d71ea3a4f
(get_keyelt): Handle an indirect entry with meta char.
Richard M. Stallman <rms@gnu.org>
parents:
17511
diff
changeset
|
2917 |
208d71ea3a4f
(get_keyelt): Handle an indirect entry with meta char.
Richard M. Stallman <rms@gnu.org>
parents:
17511
diff
changeset
|
2918 /* Search through indirections unless that's not wanted. */ |
104936
4556ab401b02
(where_is_internal): Don't erroneously return nil right after
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
104925
diff
changeset
|
2919 if (!noindirect) |
32145
a48fcf036df1
(Fwhere_is_internal): Ignore `menu-bar' and `tool-bar'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
32038
diff
changeset
|
2920 binding = get_keyelt (binding, 0); |
17788
208d71ea3a4f
(get_keyelt): Handle an indirect entry with meta char.
Richard M. Stallman <rms@gnu.org>
parents:
17511
diff
changeset
|
2921 |
208d71ea3a4f
(get_keyelt): Handle an indirect entry with meta char.
Richard M. Stallman <rms@gnu.org>
parents:
17511
diff
changeset
|
2922 /* End this iteration if this element does not match |
208d71ea3a4f
(get_keyelt): Handle an indirect entry with meta char.
Richard M. Stallman <rms@gnu.org>
parents:
17511
diff
changeset
|
2923 the target. */ |
208d71ea3a4f
(get_keyelt): Handle an indirect entry with meta char.
Richard M. Stallman <rms@gnu.org>
parents:
17511
diff
changeset
|
2924 |
32889
673e3ef1f7f6
(where_is_cache, where_is_cache_keymaps): New vars.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
32846
diff
changeset
|
2925 if (!(!NILP (where_is_cache) /* everything "matches" during cache-fill. */ |
673e3ef1f7f6
(where_is_cache, where_is_cache_keymaps): New vars.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
32846
diff
changeset
|
2926 || EQ (binding, definition) |
673e3ef1f7f6
(where_is_cache, where_is_cache_keymaps): New vars.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
32846
diff
changeset
|
2927 || (CONSP (definition) && !NILP (Fequal (binding, definition))))) |
673e3ef1f7f6
(where_is_cache, where_is_cache_keymaps): New vars.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
32846
diff
changeset
|
2928 /* Doesn't match. */ |
81792
4ee4f467ca51
(struct accessible_keymaps_data, struct where_is_internal_data): New structs.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
81609
diff
changeset
|
2929 return; |
32889
673e3ef1f7f6
(where_is_cache, where_is_cache_keymaps): New vars.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
32846
diff
changeset
|
2930 |
673e3ef1f7f6
(where_is_cache, where_is_cache_keymaps): New vars.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
32846
diff
changeset
|
2931 /* We have found a match. Construct the key sequence where we found it. */ |
17788
208d71ea3a4f
(get_keyelt): Handle an indirect entry with meta char.
Richard M. Stallman <rms@gnu.org>
parents:
17511
diff
changeset
|
2932 if (INTEGERP (key) && last_is_meta) |
208d71ea3a4f
(get_keyelt): Handle an indirect entry with meta char.
Richard M. Stallman <rms@gnu.org>
parents:
17511
diff
changeset
|
2933 { |
208d71ea3a4f
(get_keyelt): Handle an indirect entry with meta char.
Richard M. Stallman <rms@gnu.org>
parents:
17511
diff
changeset
|
2934 sequence = Fcopy_sequence (this); |
208d71ea3a4f
(get_keyelt): Handle an indirect entry with meta char.
Richard M. Stallman <rms@gnu.org>
parents:
17511
diff
changeset
|
2935 Faset (sequence, last, make_number (XINT (key) | meta_modifier)); |
208d71ea3a4f
(get_keyelt): Handle an indirect entry with meta char.
Richard M. Stallman <rms@gnu.org>
parents:
17511
diff
changeset
|
2936 } |
208d71ea3a4f
(get_keyelt): Handle an indirect entry with meta char.
Richard M. Stallman <rms@gnu.org>
parents:
17511
diff
changeset
|
2937 else |
91037
fd549372af1b
(where_is_internal_1): If key is a cons, store the copy
Kenichi Handa <handa@m17n.org>
parents:
91005
diff
changeset
|
2938 { |
fd549372af1b
(where_is_internal_1): If key is a cons, store the copy
Kenichi Handa <handa@m17n.org>
parents:
91005
diff
changeset
|
2939 if (CONSP (key)) |
fd549372af1b
(where_is_internal_1): If key is a cons, store the copy
Kenichi Handa <handa@m17n.org>
parents:
91005
diff
changeset
|
2940 key = Fcons (XCAR (key), XCDR (key)); |
fd549372af1b
(where_is_internal_1): If key is a cons, store the copy
Kenichi Handa <handa@m17n.org>
parents:
91005
diff
changeset
|
2941 sequence = append_key (this, key); |
fd549372af1b
(where_is_internal_1): If key is a cons, store the copy
Kenichi Handa <handa@m17n.org>
parents:
91005
diff
changeset
|
2942 } |
17788
208d71ea3a4f
(get_keyelt): Handle an indirect entry with meta char.
Richard M. Stallman <rms@gnu.org>
parents:
17511
diff
changeset
|
2943 |
32889
673e3ef1f7f6
(where_is_cache, where_is_cache_keymaps): New vars.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
32846
diff
changeset
|
2944 if (!NILP (where_is_cache)) |
673e3ef1f7f6
(where_is_cache, where_is_cache_keymaps): New vars.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
32846
diff
changeset
|
2945 { |
673e3ef1f7f6
(where_is_cache, where_is_cache_keymaps): New vars.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
32846
diff
changeset
|
2946 Lisp_Object sequences = Fgethash (binding, where_is_cache, Qnil); |
673e3ef1f7f6
(where_is_cache, where_is_cache_keymaps): New vars.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
32846
diff
changeset
|
2947 Fputhash (binding, Fcons (sequence, sequences), where_is_cache); |
673e3ef1f7f6
(where_is_cache, where_is_cache_keymaps): New vars.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
32846
diff
changeset
|
2948 } |
673e3ef1f7f6
(where_is_cache, where_is_cache_keymaps): New vars.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
32846
diff
changeset
|
2949 else |
81792
4ee4f467ca51
(struct accessible_keymaps_data, struct where_is_internal_data): New structs.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
81609
diff
changeset
|
2950 d->sequences = Fcons (sequence, d->sequences); |
17788
208d71ea3a4f
(get_keyelt): Handle an indirect entry with meta char.
Richard M. Stallman <rms@gnu.org>
parents:
17511
diff
changeset
|
2951 } |
250 | 2952 |
465 | 2953 /* describe-bindings - summarizing all the bindings in a set of keymaps. */ |
2954 | |
39689
0572449a62be
(Fkeymap_prompt, Fcurrent_active_maps): New funs.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
39682
diff
changeset
|
2955 DEFUN ("describe-buffer-bindings", Fdescribe_buffer_bindings, Sdescribe_buffer_bindings, 1, 3, 0, |
41001
a17c8b15ef1b
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
40804
diff
changeset
|
2956 doc: /* Insert the list of all defined keys and their definitions. |
a17c8b15ef1b
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
40804
diff
changeset
|
2957 The list is inserted in the current buffer, while the bindings are |
a17c8b15ef1b
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
40804
diff
changeset
|
2958 looked up in BUFFER. |
a17c8b15ef1b
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
40804
diff
changeset
|
2959 The optional argument PREFIX, if non-nil, should be a key sequence; |
a17c8b15ef1b
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
40804
diff
changeset
|
2960 then we display only bindings that start with that prefix. |
a17c8b15ef1b
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
40804
diff
changeset
|
2961 The optional argument MENUS, if non-nil, says to mention menu bindings. |
a17c8b15ef1b
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
40804
diff
changeset
|
2962 \(Ordinarily these are omitted from the output.) */) |
109179
8cfee7d2955f
Convert DEFUNs to standard C.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
109165
diff
changeset
|
2963 (Lisp_Object buffer, Lisp_Object prefix, Lisp_Object menus) |
250 | 2964 { |
39689
0572449a62be
(Fkeymap_prompt, Fcurrent_active_maps): New funs.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
39682
diff
changeset
|
2965 Lisp_Object outbuf, shadow; |
0572449a62be
(Fkeymap_prompt, Fcurrent_active_maps): New funs.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
39682
diff
changeset
|
2966 int nomenu = NILP (menus); |
7186
092688f7ebbb
(describe_buffer_bindings): gcpro stuff. Delete some unused code.
Karl Heuer <kwzh@gnu.org>
parents:
7184
diff
changeset
|
2967 register Lisp_Object start1; |
092688f7ebbb
(describe_buffer_bindings): gcpro stuff. Delete some unused code.
Karl Heuer <kwzh@gnu.org>
parents:
7184
diff
changeset
|
2968 struct gcpro gcpro1; |
250 | 2969 |
1120
0a486e1a45bc
* keymap.c (describe_buffer_bindings): Adjust key_heading to match
Jim Blandy <jimb@redhat.com>
parents:
1095
diff
changeset
|
2970 char *alternate_heading |
0a486e1a45bc
* keymap.c (describe_buffer_bindings): Adjust key_heading to match
Jim Blandy <jimb@redhat.com>
parents:
1095
diff
changeset
|
2971 = "\ |
20850
ffbaaba0bf76
(Fdescribe_bindings_internal):
Richard M. Stallman <rms@gnu.org>
parents:
20708
diff
changeset
|
2972 Keyboard translations:\n\n\ |
ffbaaba0bf76
(Fdescribe_bindings_internal):
Richard M. Stallman <rms@gnu.org>
parents:
20708
diff
changeset
|
2973 You type Translation\n\ |
ffbaaba0bf76
(Fdescribe_bindings_internal):
Richard M. Stallman <rms@gnu.org>
parents:
20708
diff
changeset
|
2974 -------- -----------\n"; |
250 | 2975 |
76415
a31980a5f310
(Fdescribe_buffer_bindings): Check that BUFFER is valid.
Juanma Barranquero <lekktu@gmail.com>
parents:
76269
diff
changeset
|
2976 CHECK_BUFFER (buffer); |
a31980a5f310
(Fdescribe_buffer_bindings): Check that BUFFER is valid.
Juanma Barranquero <lekktu@gmail.com>
parents:
76269
diff
changeset
|
2977 |
4575
bf0f07186369
(describe_buffer_bindings): Declare shadow just once.
Richard M. Stallman <rms@gnu.org>
parents:
4138
diff
changeset
|
2978 shadow = Qnil; |
7186
092688f7ebbb
(describe_buffer_bindings): gcpro stuff. Delete some unused code.
Karl Heuer <kwzh@gnu.org>
parents:
7184
diff
changeset
|
2979 GCPRO1 (shadow); |
3952
f9dfc2872fb0
(describe_map_tree): Insert key_heading here.
Richard M. Stallman <rms@gnu.org>
parents:
3908
diff
changeset
|
2980 |
40625
1248b61b7baf
(Fdescribe_buffer_bindings): Print character property
Richard M. Stallman <rms@gnu.org>
parents:
40401
diff
changeset
|
2981 outbuf = Fcurrent_buffer (); |
250 | 2982 |
1120
0a486e1a45bc
* keymap.c (describe_buffer_bindings): Adjust key_heading to match
Jim Blandy <jimb@redhat.com>
parents:
1095
diff
changeset
|
2983 /* Report on alternates for keys. */ |
83391
e99392472e41
Change `keyboard-translate-table' to be terminal-local.
Karoly Lorentey <lorentey@elte.hu>
parents:
83380
diff
changeset
|
2984 if (STRINGP (current_kboard->Vkeyboard_translate_table) && !NILP (prefix)) |
1120
0a486e1a45bc
* keymap.c (describe_buffer_bindings): Adjust key_heading to match
Jim Blandy <jimb@redhat.com>
parents:
1095
diff
changeset
|
2985 { |
0a486e1a45bc
* keymap.c (describe_buffer_bindings): Adjust key_heading to match
Jim Blandy <jimb@redhat.com>
parents:
1095
diff
changeset
|
2986 int c; |
83391
e99392472e41
Change `keyboard-translate-table' to be terminal-local.
Karoly Lorentey <lorentey@elte.hu>
parents:
83380
diff
changeset
|
2987 const unsigned char *translate = SDATA (current_kboard->Vkeyboard_translate_table); |
e99392472e41
Change `keyboard-translate-table' to be terminal-local.
Karoly Lorentey <lorentey@elte.hu>
parents:
83380
diff
changeset
|
2988 int translate_len = SCHARS (current_kboard->Vkeyboard_translate_table); |
1120
0a486e1a45bc
* keymap.c (describe_buffer_bindings): Adjust key_heading to match
Jim Blandy <jimb@redhat.com>
parents:
1095
diff
changeset
|
2989 |
0a486e1a45bc
* keymap.c (describe_buffer_bindings): Adjust key_heading to match
Jim Blandy <jimb@redhat.com>
parents:
1095
diff
changeset
|
2990 for (c = 0; c < translate_len; c++) |
0a486e1a45bc
* keymap.c (describe_buffer_bindings): Adjust key_heading to match
Jim Blandy <jimb@redhat.com>
parents:
1095
diff
changeset
|
2991 if (translate[c] != c) |
0a486e1a45bc
* keymap.c (describe_buffer_bindings): Adjust key_heading to match
Jim Blandy <jimb@redhat.com>
parents:
1095
diff
changeset
|
2992 { |
26481
70d85ae6dfee
(Fsingle_key_description): Use KEY_DESCRIPTION_SIZE to
Kenichi Handa <handa@m17n.org>
parents:
26404
diff
changeset
|
2993 char buf[KEY_DESCRIPTION_SIZE]; |
1120
0a486e1a45bc
* keymap.c (describe_buffer_bindings): Adjust key_heading to match
Jim Blandy <jimb@redhat.com>
parents:
1095
diff
changeset
|
2994 char *bufend; |
0a486e1a45bc
* keymap.c (describe_buffer_bindings): Adjust key_heading to match
Jim Blandy <jimb@redhat.com>
parents:
1095
diff
changeset
|
2995 |
0a486e1a45bc
* keymap.c (describe_buffer_bindings): Adjust key_heading to match
Jim Blandy <jimb@redhat.com>
parents:
1095
diff
changeset
|
2996 if (alternate_heading) |
0a486e1a45bc
* keymap.c (describe_buffer_bindings): Adjust key_heading to match
Jim Blandy <jimb@redhat.com>
parents:
1095
diff
changeset
|
2997 { |
0a486e1a45bc
* keymap.c (describe_buffer_bindings): Adjust key_heading to match
Jim Blandy <jimb@redhat.com>
parents:
1095
diff
changeset
|
2998 insert_string (alternate_heading); |
0a486e1a45bc
* keymap.c (describe_buffer_bindings): Adjust key_heading to match
Jim Blandy <jimb@redhat.com>
parents:
1095
diff
changeset
|
2999 alternate_heading = 0; |
0a486e1a45bc
* keymap.c (describe_buffer_bindings): Adjust key_heading to match
Jim Blandy <jimb@redhat.com>
parents:
1095
diff
changeset
|
3000 } |
0a486e1a45bc
* keymap.c (describe_buffer_bindings): Adjust key_heading to match
Jim Blandy <jimb@redhat.com>
parents:
1095
diff
changeset
|
3001 |
34906
333a490b6ebc
(push_key_description): Add parameter FORCE_MULTIBYTE.
Gerd Moellmann <gerd@gnu.org>
parents:
34765
diff
changeset
|
3002 bufend = push_key_description (translate[c], buf, 1); |
1120
0a486e1a45bc
* keymap.c (describe_buffer_bindings): Adjust key_heading to match
Jim Blandy <jimb@redhat.com>
parents:
1095
diff
changeset
|
3003 insert (buf, bufend - buf); |
0a486e1a45bc
* keymap.c (describe_buffer_bindings): Adjust key_heading to match
Jim Blandy <jimb@redhat.com>
parents:
1095
diff
changeset
|
3004 Findent_to (make_number (16), make_number (1)); |
34906
333a490b6ebc
(push_key_description): Add parameter FORCE_MULTIBYTE.
Gerd Moellmann <gerd@gnu.org>
parents:
34765
diff
changeset
|
3005 bufend = push_key_description (c, buf, 1); |
1120
0a486e1a45bc
* keymap.c (describe_buffer_bindings): Adjust key_heading to match
Jim Blandy <jimb@redhat.com>
parents:
1095
diff
changeset
|
3006 insert (buf, bufend - buf); |
0a486e1a45bc
* keymap.c (describe_buffer_bindings): Adjust key_heading to match
Jim Blandy <jimb@redhat.com>
parents:
1095
diff
changeset
|
3007 |
0a486e1a45bc
* keymap.c (describe_buffer_bindings): Adjust key_heading to match
Jim Blandy <jimb@redhat.com>
parents:
1095
diff
changeset
|
3008 insert ("\n", 1); |
65456
d9638b932900
(Fdescribe_buffer_bindings): Reload `translate'
Kim F. Storm <storm@cua.dk>
parents:
64770
diff
changeset
|
3009 |
d9638b932900
(Fdescribe_buffer_bindings): Reload `translate'
Kim F. Storm <storm@cua.dk>
parents:
64770
diff
changeset
|
3010 /* Insert calls signal_after_change which may GC. */ |
83391
e99392472e41
Change `keyboard-translate-table' to be terminal-local.
Karoly Lorentey <lorentey@elte.hu>
parents:
83380
diff
changeset
|
3011 translate = SDATA (current_kboard->Vkeyboard_translate_table); |
1120
0a486e1a45bc
* keymap.c (describe_buffer_bindings): Adjust key_heading to match
Jim Blandy <jimb@redhat.com>
parents:
1095
diff
changeset
|
3012 } |
0a486e1a45bc
* keymap.c (describe_buffer_bindings): Adjust key_heading to match
Jim Blandy <jimb@redhat.com>
parents:
1095
diff
changeset
|
3013 |
0a486e1a45bc
* keymap.c (describe_buffer_bindings): Adjust key_heading to match
Jim Blandy <jimb@redhat.com>
parents:
1095
diff
changeset
|
3014 insert ("\n", 1); |
0a486e1a45bc
* keymap.c (describe_buffer_bindings): Adjust key_heading to match
Jim Blandy <jimb@redhat.com>
parents:
1095
diff
changeset
|
3015 } |
0a486e1a45bc
* keymap.c (describe_buffer_bindings): Adjust key_heading to match
Jim Blandy <jimb@redhat.com>
parents:
1095
diff
changeset
|
3016 |
12710
26c09987d2f3
(describe_buffer_bindings): Print bindings from
Richard M. Stallman <rms@gnu.org>
parents:
12542
diff
changeset
|
3017 if (!NILP (Vkey_translation_map)) |
26c09987d2f3
(describe_buffer_bindings): Print bindings from
Richard M. Stallman <rms@gnu.org>
parents:
12542
diff
changeset
|
3018 describe_map_tree (Vkey_translation_map, 0, Qnil, prefix, |
60066
eca75f16d020
(describe_map_tree): New arg MENTION_SHADOW. Calls changed.
Richard M. Stallman <rms@gnu.org>
parents:
59754
diff
changeset
|
3019 "Key translations", nomenu, 1, 0, 0); |
12710
26c09987d2f3
(describe_buffer_bindings): Print bindings from
Richard M. Stallman <rms@gnu.org>
parents:
12542
diff
changeset
|
3020 |
465 | 3021 |
3952
f9dfc2872fb0
(describe_map_tree): Insert key_heading here.
Richard M. Stallman <rms@gnu.org>
parents:
3908
diff
changeset
|
3022 /* Print the (major mode) local map. */ |
40625
1248b61b7baf
(Fdescribe_buffer_bindings): Print character property
Richard M. Stallman <rms@gnu.org>
parents:
40401
diff
changeset
|
3023 start1 = Qnil; |
12262
a7d5578ebb25
(Fkey_binding, describe_buffer_bindings):
Karl Heuer <kwzh@gnu.org>
parents:
12151
diff
changeset
|
3024 if (!NILP (current_kboard->Voverriding_terminal_local_map)) |
a7d5578ebb25
(Fkey_binding, describe_buffer_bindings):
Karl Heuer <kwzh@gnu.org>
parents:
12151
diff
changeset
|
3025 start1 = current_kboard->Voverriding_terminal_local_map; |
a7d5578ebb25
(Fkey_binding, describe_buffer_bindings):
Karl Heuer <kwzh@gnu.org>
parents:
12151
diff
changeset
|
3026 else if (!NILP (Voverriding_local_map)) |
5613
cad51b2de6cd
(Fkey_binding): Handle Voverriding_local_map.
Richard M. Stallman <rms@gnu.org>
parents:
5551
diff
changeset
|
3027 start1 = Voverriding_local_map; |
cad51b2de6cd
(Fkey_binding): Handle Voverriding_local_map.
Richard M. Stallman <rms@gnu.org>
parents:
5551
diff
changeset
|
3028 |
485 | 3029 if (!NILP (start1)) |
250 | 3030 { |
16465
398e3995162d
(describe_buffer_bindings): Pass 1 for PARTIAL
Richard M. Stallman <rms@gnu.org>
parents:
16227
diff
changeset
|
3031 describe_map_tree (start1, 1, shadow, prefix, |
60066
eca75f16d020
(describe_map_tree): New arg MENTION_SHADOW. Calls changed.
Richard M. Stallman <rms@gnu.org>
parents:
59754
diff
changeset
|
3032 "\f\nOverriding Bindings", nomenu, 0, 0, 0); |
3952
f9dfc2872fb0
(describe_map_tree): Insert key_heading here.
Richard M. Stallman <rms@gnu.org>
parents:
3908
diff
changeset
|
3033 shadow = Fcons (start1, shadow); |
250 | 3034 } |
40625
1248b61b7baf
(Fdescribe_buffer_bindings): Print character property
Richard M. Stallman <rms@gnu.org>
parents:
40401
diff
changeset
|
3035 else |
1248b61b7baf
(Fdescribe_buffer_bindings): Print character property
Richard M. Stallman <rms@gnu.org>
parents:
40401
diff
changeset
|
3036 { |
1248b61b7baf
(Fdescribe_buffer_bindings): Print character property
Richard M. Stallman <rms@gnu.org>
parents:
40401
diff
changeset
|
3037 /* Print the minor mode and major mode keymaps. */ |
1248b61b7baf
(Fdescribe_buffer_bindings): Print character property
Richard M. Stallman <rms@gnu.org>
parents:
40401
diff
changeset
|
3038 int i, nmaps; |
1248b61b7baf
(Fdescribe_buffer_bindings): Print character property
Richard M. Stallman <rms@gnu.org>
parents:
40401
diff
changeset
|
3039 Lisp_Object *modes, *maps; |
1248b61b7baf
(Fdescribe_buffer_bindings): Print character property
Richard M. Stallman <rms@gnu.org>
parents:
40401
diff
changeset
|
3040 |
1248b61b7baf
(Fdescribe_buffer_bindings): Print character property
Richard M. Stallman <rms@gnu.org>
parents:
40401
diff
changeset
|
3041 /* Temporarily switch to `buffer', so that we can get that buffer's |
1248b61b7baf
(Fdescribe_buffer_bindings): Print character property
Richard M. Stallman <rms@gnu.org>
parents:
40401
diff
changeset
|
3042 minor modes correctly. */ |
1248b61b7baf
(Fdescribe_buffer_bindings): Print character property
Richard M. Stallman <rms@gnu.org>
parents:
40401
diff
changeset
|
3043 Fset_buffer (buffer); |
1248b61b7baf
(Fdescribe_buffer_bindings): Print character property
Richard M. Stallman <rms@gnu.org>
parents:
40401
diff
changeset
|
3044 |
1248b61b7baf
(Fdescribe_buffer_bindings): Print character property
Richard M. Stallman <rms@gnu.org>
parents:
40401
diff
changeset
|
3045 nmaps = current_minor_maps (&modes, &maps); |
1248b61b7baf
(Fdescribe_buffer_bindings): Print character property
Richard M. Stallman <rms@gnu.org>
parents:
40401
diff
changeset
|
3046 Fset_buffer (outbuf); |
1248b61b7baf
(Fdescribe_buffer_bindings): Print character property
Richard M. Stallman <rms@gnu.org>
parents:
40401
diff
changeset
|
3047 |
42510
dde71e46eeeb
(Fcurrent_active_maps): Put the `keymap' property map first.
Richard M. Stallman <rms@gnu.org>
parents:
42404
diff
changeset
|
3048 start1 = get_local_map (BUF_PT (XBUFFER (buffer)), |
dde71e46eeeb
(Fcurrent_active_maps): Put the `keymap' property map first.
Richard M. Stallman <rms@gnu.org>
parents:
42404
diff
changeset
|
3049 XBUFFER (buffer), Qkeymap); |
dde71e46eeeb
(Fcurrent_active_maps): Put the `keymap' property map first.
Richard M. Stallman <rms@gnu.org>
parents:
42404
diff
changeset
|
3050 if (!NILP (start1)) |
dde71e46eeeb
(Fcurrent_active_maps): Put the `keymap' property map first.
Richard M. Stallman <rms@gnu.org>
parents:
42404
diff
changeset
|
3051 { |
dde71e46eeeb
(Fcurrent_active_maps): Put the `keymap' property map first.
Richard M. Stallman <rms@gnu.org>
parents:
42404
diff
changeset
|
3052 describe_map_tree (start1, 1, shadow, prefix, |
60066
eca75f16d020
(describe_map_tree): New arg MENTION_SHADOW. Calls changed.
Richard M. Stallman <rms@gnu.org>
parents:
59754
diff
changeset
|
3053 "\f\n`keymap' Property Bindings", nomenu, |
eca75f16d020
(describe_map_tree): New arg MENTION_SHADOW. Calls changed.
Richard M. Stallman <rms@gnu.org>
parents:
59754
diff
changeset
|
3054 0, 0, 0); |
42510
dde71e46eeeb
(Fcurrent_active_maps): Put the `keymap' property map first.
Richard M. Stallman <rms@gnu.org>
parents:
42404
diff
changeset
|
3055 shadow = Fcons (start1, shadow); |
dde71e46eeeb
(Fcurrent_active_maps): Put the `keymap' property map first.
Richard M. Stallman <rms@gnu.org>
parents:
42404
diff
changeset
|
3056 } |
dde71e46eeeb
(Fcurrent_active_maps): Put the `keymap' property map first.
Richard M. Stallman <rms@gnu.org>
parents:
42404
diff
changeset
|
3057 |
40625
1248b61b7baf
(Fdescribe_buffer_bindings): Print character property
Richard M. Stallman <rms@gnu.org>
parents:
40401
diff
changeset
|
3058 /* Print the minor mode maps. */ |
1248b61b7baf
(Fdescribe_buffer_bindings): Print character property
Richard M. Stallman <rms@gnu.org>
parents:
40401
diff
changeset
|
3059 for (i = 0; i < nmaps; i++) |
1248b61b7baf
(Fdescribe_buffer_bindings): Print character property
Richard M. Stallman <rms@gnu.org>
parents:
40401
diff
changeset
|
3060 { |
1248b61b7baf
(Fdescribe_buffer_bindings): Print character property
Richard M. Stallman <rms@gnu.org>
parents:
40401
diff
changeset
|
3061 /* The title for a minor mode keymap |
1248b61b7baf
(Fdescribe_buffer_bindings): Print character property
Richard M. Stallman <rms@gnu.org>
parents:
40401
diff
changeset
|
3062 is constructed at run time. |
1248b61b7baf
(Fdescribe_buffer_bindings): Print character property
Richard M. Stallman <rms@gnu.org>
parents:
40401
diff
changeset
|
3063 We let describe_map_tree do the actual insertion |
1248b61b7baf
(Fdescribe_buffer_bindings): Print character property
Richard M. Stallman <rms@gnu.org>
parents:
40401
diff
changeset
|
3064 because it takes care of other features when doing so. */ |
1248b61b7baf
(Fdescribe_buffer_bindings): Print character property
Richard M. Stallman <rms@gnu.org>
parents:
40401
diff
changeset
|
3065 char *title, *p; |
1248b61b7baf
(Fdescribe_buffer_bindings): Print character property
Richard M. Stallman <rms@gnu.org>
parents:
40401
diff
changeset
|
3066 |
1248b61b7baf
(Fdescribe_buffer_bindings): Print character property
Richard M. Stallman <rms@gnu.org>
parents:
40401
diff
changeset
|
3067 if (!SYMBOLP (modes[i])) |
96747
ebf3bd5f0017
* keymap.c: Remove all NS-specific code.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
96675
diff
changeset
|
3068 abort (); |
40625
1248b61b7baf
(Fdescribe_buffer_bindings): Print character property
Richard M. Stallman <rms@gnu.org>
parents:
40401
diff
changeset
|
3069 |
46370
40db0673e6f0
Most uses of XSTRING combined with STRING_BYTES or indirection changed to
Ken Raeburn <raeburn@raeburn.org>
parents:
46310
diff
changeset
|
3070 p = title = (char *) alloca (42 + SCHARS (SYMBOL_NAME (modes[i]))); |
40625
1248b61b7baf
(Fdescribe_buffer_bindings): Print character property
Richard M. Stallman <rms@gnu.org>
parents:
40401
diff
changeset
|
3071 *p++ = '\f'; |
1248b61b7baf
(Fdescribe_buffer_bindings): Print character property
Richard M. Stallman <rms@gnu.org>
parents:
40401
diff
changeset
|
3072 *p++ = '\n'; |
1248b61b7baf
(Fdescribe_buffer_bindings): Print character property
Richard M. Stallman <rms@gnu.org>
parents:
40401
diff
changeset
|
3073 *p++ = '`'; |
109165
750db9f3e6d8
Replace bcopy, bzero, bcmp by memcpy, memmove, memset, memcmp
Andreas Schwab <schwab@linux-m68k.org>
parents:
109131
diff
changeset
|
3074 memcpy (p, SDATA (SYMBOL_NAME (modes[i])), |
750db9f3e6d8
Replace bcopy, bzero, bcmp by memcpy, memmove, memset, memcmp
Andreas Schwab <schwab@linux-m68k.org>
parents:
109131
diff
changeset
|
3075 SCHARS (SYMBOL_NAME (modes[i]))); |
46370
40db0673e6f0
Most uses of XSTRING combined with STRING_BYTES or indirection changed to
Ken Raeburn <raeburn@raeburn.org>
parents:
46310
diff
changeset
|
3076 p += SCHARS (SYMBOL_NAME (modes[i])); |
40625
1248b61b7baf
(Fdescribe_buffer_bindings): Print character property
Richard M. Stallman <rms@gnu.org>
parents:
40401
diff
changeset
|
3077 *p++ = '\''; |
109165
750db9f3e6d8
Replace bcopy, bzero, bcmp by memcpy, memmove, memset, memcmp
Andreas Schwab <schwab@linux-m68k.org>
parents:
109131
diff
changeset
|
3078 memcpy (p, " Minor Mode Bindings", strlen (" Minor Mode Bindings")); |
750db9f3e6d8
Replace bcopy, bzero, bcmp by memcpy, memmove, memset, memcmp
Andreas Schwab <schwab@linux-m68k.org>
parents:
109131
diff
changeset
|
3079 p += strlen (" Minor Mode Bindings"); |
40625
1248b61b7baf
(Fdescribe_buffer_bindings): Print character property
Richard M. Stallman <rms@gnu.org>
parents:
40401
diff
changeset
|
3080 *p = 0; |
1248b61b7baf
(Fdescribe_buffer_bindings): Print character property
Richard M. Stallman <rms@gnu.org>
parents:
40401
diff
changeset
|
3081 |
60066
eca75f16d020
(describe_map_tree): New arg MENTION_SHADOW. Calls changed.
Richard M. Stallman <rms@gnu.org>
parents:
59754
diff
changeset
|
3082 describe_map_tree (maps[i], 1, shadow, prefix, |
eca75f16d020
(describe_map_tree): New arg MENTION_SHADOW. Calls changed.
Richard M. Stallman <rms@gnu.org>
parents:
59754
diff
changeset
|
3083 title, nomenu, 0, 0, 0); |
40625
1248b61b7baf
(Fdescribe_buffer_bindings): Print character property
Richard M. Stallman <rms@gnu.org>
parents:
40401
diff
changeset
|
3084 shadow = Fcons (maps[i], shadow); |
1248b61b7baf
(Fdescribe_buffer_bindings): Print character property
Richard M. Stallman <rms@gnu.org>
parents:
40401
diff
changeset
|
3085 } |
1248b61b7baf
(Fdescribe_buffer_bindings): Print character property
Richard M. Stallman <rms@gnu.org>
parents:
40401
diff
changeset
|
3086 |
1248b61b7baf
(Fdescribe_buffer_bindings): Print character property
Richard M. Stallman <rms@gnu.org>
parents:
40401
diff
changeset
|
3087 start1 = get_local_map (BUF_PT (XBUFFER (buffer)), |
1248b61b7baf
(Fdescribe_buffer_bindings): Print character property
Richard M. Stallman <rms@gnu.org>
parents:
40401
diff
changeset
|
3088 XBUFFER (buffer), Qlocal_map); |
1248b61b7baf
(Fdescribe_buffer_bindings): Print character property
Richard M. Stallman <rms@gnu.org>
parents:
40401
diff
changeset
|
3089 if (!NILP (start1)) |
1248b61b7baf
(Fdescribe_buffer_bindings): Print character property
Richard M. Stallman <rms@gnu.org>
parents:
40401
diff
changeset
|
3090 { |
1248b61b7baf
(Fdescribe_buffer_bindings): Print character property
Richard M. Stallman <rms@gnu.org>
parents:
40401
diff
changeset
|
3091 if (EQ (start1, XBUFFER (buffer)->keymap)) |
1248b61b7baf
(Fdescribe_buffer_bindings): Print character property
Richard M. Stallman <rms@gnu.org>
parents:
40401
diff
changeset
|
3092 describe_map_tree (start1, 1, shadow, prefix, |
60066
eca75f16d020
(describe_map_tree): New arg MENTION_SHADOW. Calls changed.
Richard M. Stallman <rms@gnu.org>
parents:
59754
diff
changeset
|
3093 "\f\nMajor Mode Bindings", nomenu, 0, 0, 0); |
40625
1248b61b7baf
(Fdescribe_buffer_bindings): Print character property
Richard M. Stallman <rms@gnu.org>
parents:
40401
diff
changeset
|
3094 else |
1248b61b7baf
(Fdescribe_buffer_bindings): Print character property
Richard M. Stallman <rms@gnu.org>
parents:
40401
diff
changeset
|
3095 describe_map_tree (start1, 1, shadow, prefix, |
42510
dde71e46eeeb
(Fcurrent_active_maps): Put the `keymap' property map first.
Richard M. Stallman <rms@gnu.org>
parents:
42404
diff
changeset
|
3096 "\f\n`local-map' Property Bindings", |
60066
eca75f16d020
(describe_map_tree): New arg MENTION_SHADOW. Calls changed.
Richard M. Stallman <rms@gnu.org>
parents:
59754
diff
changeset
|
3097 nomenu, 0, 0, 0); |
40625
1248b61b7baf
(Fdescribe_buffer_bindings): Print character property
Richard M. Stallman <rms@gnu.org>
parents:
40401
diff
changeset
|
3098 |
1248b61b7baf
(Fdescribe_buffer_bindings): Print character property
Richard M. Stallman <rms@gnu.org>
parents:
40401
diff
changeset
|
3099 shadow = Fcons (start1, shadow); |
1248b61b7baf
(Fdescribe_buffer_bindings): Print character property
Richard M. Stallman <rms@gnu.org>
parents:
40401
diff
changeset
|
3100 } |
1248b61b7baf
(Fdescribe_buffer_bindings): Print character property
Richard M. Stallman <rms@gnu.org>
parents:
40401
diff
changeset
|
3101 } |
250 | 3102 |
16465
398e3995162d
(describe_buffer_bindings): Pass 1 for PARTIAL
Richard M. Stallman <rms@gnu.org>
parents:
16227
diff
changeset
|
3103 describe_map_tree (current_global_map, 1, shadow, prefix, |
60066
eca75f16d020
(describe_map_tree): New arg MENTION_SHADOW. Calls changed.
Richard M. Stallman <rms@gnu.org>
parents:
59754
diff
changeset
|
3104 "\f\nGlobal Bindings", nomenu, 0, 1, 0); |
12710
26c09987d2f3
(describe_buffer_bindings): Print bindings from
Richard M. Stallman <rms@gnu.org>
parents:
12542
diff
changeset
|
3105 |
26c09987d2f3
(describe_buffer_bindings): Print bindings from
Richard M. Stallman <rms@gnu.org>
parents:
12542
diff
changeset
|
3106 /* Print the function-key-map translations under this prefix. */ |
83346
7372c2f9daac
Rename function-key-map to local-function-key-map, and global-function-key-map to function-key-map. Same for key-translation-map.
Karoly Lorentey <lorentey@elte.hu>
parents:
83332
diff
changeset
|
3107 if (!NILP (current_kboard->Vlocal_function_key_map)) |
7372c2f9daac
Rename function-key-map to local-function-key-map, and global-function-key-map to function-key-map. Same for key-translation-map.
Karoly Lorentey <lorentey@elte.hu>
parents:
83332
diff
changeset
|
3108 describe_map_tree (current_kboard->Vlocal_function_key_map, 0, Qnil, prefix, |
60066
eca75f16d020
(describe_map_tree): New arg MENTION_SHADOW. Calls changed.
Richard M. Stallman <rms@gnu.org>
parents:
59754
diff
changeset
|
3109 "\f\nFunction key map translations", nomenu, 1, 0, 0); |
250 | 3110 |
85106
fd282fb888de
Add new `input-decode-map' keymap and use it for temrinal
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
83652
diff
changeset
|
3111 /* Print the input-decode-map translations under this prefix. */ |
fd282fb888de
Add new `input-decode-map' keymap and use it for temrinal
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
83652
diff
changeset
|
3112 if (!NILP (current_kboard->Vinput_decode_map)) |
fd282fb888de
Add new `input-decode-map' keymap and use it for temrinal
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
83652
diff
changeset
|
3113 describe_map_tree (current_kboard->Vinput_decode_map, 0, Qnil, prefix, |
fd282fb888de
Add new `input-decode-map' keymap and use it for temrinal
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
83652
diff
changeset
|
3114 "\f\nInput decoding map translations", nomenu, 1, 0, 0); |
fd282fb888de
Add new `input-decode-map' keymap and use it for temrinal
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
83652
diff
changeset
|
3115 |
7186
092688f7ebbb
(describe_buffer_bindings): gcpro stuff. Delete some unused code.
Karl Heuer <kwzh@gnu.org>
parents:
7184
diff
changeset
|
3116 UNGCPRO; |
250 | 3117 return Qnil; |
3118 } | |
3119 | |
13947 | 3120 /* Insert a description of the key bindings in STARTMAP, |
250 | 3121 followed by those of all maps reachable through STARTMAP. |
3122 If PARTIAL is nonzero, omit certain "uninteresting" commands | |
3123 (such as `undefined'). | |
3952
f9dfc2872fb0
(describe_map_tree): Insert key_heading here.
Richard M. Stallman <rms@gnu.org>
parents:
3908
diff
changeset
|
3124 If SHADOW is non-nil, it is a list of maps; |
f9dfc2872fb0
(describe_map_tree): Insert key_heading here.
Richard M. Stallman <rms@gnu.org>
parents:
3908
diff
changeset
|
3125 don't mention keys which would be shadowed by any of them. |
f9dfc2872fb0
(describe_map_tree): Insert key_heading here.
Richard M. Stallman <rms@gnu.org>
parents:
3908
diff
changeset
|
3126 PREFIX, if non-nil, says mention only keys that start with PREFIX. |
4023
5e4f918d5d44
(describe_map_tree): When inserting TITLE, mention PREFIX.
Richard M. Stallman <rms@gnu.org>
parents:
3962
diff
changeset
|
3127 TITLE, if not 0, is a string to insert at the beginning. |
5551
2b8f405f5103
(describe_map_tree): New arg NOMENU.
Richard M. Stallman <rms@gnu.org>
parents:
5367
diff
changeset
|
3128 TITLE should not end with a colon or a newline; we supply that. |
12710
26c09987d2f3
(describe_buffer_bindings): Print bindings from
Richard M. Stallman <rms@gnu.org>
parents:
12542
diff
changeset
|
3129 If NOMENU is not 0, then omit menu-bar commands. |
26c09987d2f3
(describe_buffer_bindings): Print bindings from
Richard M. Stallman <rms@gnu.org>
parents:
12542
diff
changeset
|
3130 |
26c09987d2f3
(describe_buffer_bindings): Print bindings from
Richard M. Stallman <rms@gnu.org>
parents:
12542
diff
changeset
|
3131 If TRANSL is nonzero, the definitions are actually key translations |
13245
2e0c4159e94b
(describe_map_tree): New arg always_title. Callers changed.
Richard M. Stallman <rms@gnu.org>
parents:
13201
diff
changeset
|
3132 so print strings and vectors differently. |
2e0c4159e94b
(describe_map_tree): New arg always_title. Callers changed.
Richard M. Stallman <rms@gnu.org>
parents:
13201
diff
changeset
|
3133 |
2e0c4159e94b
(describe_map_tree): New arg always_title. Callers changed.
Richard M. Stallman <rms@gnu.org>
parents:
13201
diff
changeset
|
3134 If ALWAYS_TITLE is nonzero, print the title even if there are no maps |
60066
eca75f16d020
(describe_map_tree): New arg MENTION_SHADOW. Calls changed.
Richard M. Stallman <rms@gnu.org>
parents:
59754
diff
changeset
|
3135 to look through. |
eca75f16d020
(describe_map_tree): New arg MENTION_SHADOW. Calls changed.
Richard M. Stallman <rms@gnu.org>
parents:
59754
diff
changeset
|
3136 |
eca75f16d020
(describe_map_tree): New arg MENTION_SHADOW. Calls changed.
Richard M. Stallman <rms@gnu.org>
parents:
59754
diff
changeset
|
3137 If MENTION_SHADOW is nonzero, then when something is shadowed by SHADOW, |
eca75f16d020
(describe_map_tree): New arg MENTION_SHADOW. Calls changed.
Richard M. Stallman <rms@gnu.org>
parents:
59754
diff
changeset
|
3138 don't omit it; instead, mention it but say it is shadowed. */ |
250 | 3139 |
3140 void | |
109364
89a16701cde1
Convert old-style definitions
Andreas Schwab <schwab@linux-m68k.org>
parents:
109302
diff
changeset
|
3141 describe_map_tree (Lisp_Object startmap, int partial, Lisp_Object shadow, |
89a16701cde1
Convert old-style definitions
Andreas Schwab <schwab@linux-m68k.org>
parents:
109302
diff
changeset
|
3142 Lisp_Object prefix, char *title, int nomenu, int transl, |
89a16701cde1
Convert old-style definitions
Andreas Schwab <schwab@linux-m68k.org>
parents:
109302
diff
changeset
|
3143 int always_title, int mention_shadow) |
250 | 3144 { |
20883
4aeabf3b8f98
(describe_map_tree): Add the maps we have already
Richard M. Stallman <rms@gnu.org>
parents:
20850
diff
changeset
|
3145 Lisp_Object maps, orig_maps, seen, sub_shadows; |
7184
caac285c072d
(describe_map_tree): gcpro some things.
Karl Heuer <kwzh@gnu.org>
parents:
7183
diff
changeset
|
3146 struct gcpro gcpro1, gcpro2, gcpro3; |
4023
5e4f918d5d44
(describe_map_tree): When inserting TITLE, mention PREFIX.
Richard M. Stallman <rms@gnu.org>
parents:
3962
diff
changeset
|
3147 int something = 0; |
3952
f9dfc2872fb0
(describe_map_tree): Insert key_heading here.
Richard M. Stallman <rms@gnu.org>
parents:
3908
diff
changeset
|
3148 char *key_heading |
f9dfc2872fb0
(describe_map_tree): Insert key_heading here.
Richard M. Stallman <rms@gnu.org>
parents:
3908
diff
changeset
|
3149 = "\ |
f9dfc2872fb0
(describe_map_tree): Insert key_heading here.
Richard M. Stallman <rms@gnu.org>
parents:
3908
diff
changeset
|
3150 key binding\n\ |
f9dfc2872fb0
(describe_map_tree): Insert key_heading here.
Richard M. Stallman <rms@gnu.org>
parents:
3908
diff
changeset
|
3151 --- -------\n"; |
250 | 3152 |
20883
4aeabf3b8f98
(describe_map_tree): Add the maps we have already
Richard M. Stallman <rms@gnu.org>
parents:
20850
diff
changeset
|
3153 orig_maps = maps = Faccessible_keymaps (startmap, prefix); |
6976
4d540eeb2dd5
(describe_map_tree, describe_map): Skip keymaps we've seen before.
Karl Heuer <kwzh@gnu.org>
parents:
6974
diff
changeset
|
3154 seen = Qnil; |
7184
caac285c072d
(describe_map_tree): gcpro some things.
Karl Heuer <kwzh@gnu.org>
parents:
7183
diff
changeset
|
3155 sub_shadows = Qnil; |
caac285c072d
(describe_map_tree): gcpro some things.
Karl Heuer <kwzh@gnu.org>
parents:
7183
diff
changeset
|
3156 GCPRO3 (maps, seen, sub_shadows); |
250 | 3157 |
5551
2b8f405f5103
(describe_map_tree): New arg NOMENU.
Richard M. Stallman <rms@gnu.org>
parents:
5367
diff
changeset
|
3158 if (nomenu) |
2b8f405f5103
(describe_map_tree): New arg NOMENU.
Richard M. Stallman <rms@gnu.org>
parents:
5367
diff
changeset
|
3159 { |
2b8f405f5103
(describe_map_tree): New arg NOMENU.
Richard M. Stallman <rms@gnu.org>
parents:
5367
diff
changeset
|
3160 Lisp_Object list; |
2b8f405f5103
(describe_map_tree): New arg NOMENU.
Richard M. Stallman <rms@gnu.org>
parents:
5367
diff
changeset
|
3161 |
2b8f405f5103
(describe_map_tree): New arg NOMENU.
Richard M. Stallman <rms@gnu.org>
parents:
5367
diff
changeset
|
3162 /* Delete from MAPS each element that is for the menu bar. */ |
85372
f7d19cfed7da
* xselect.c (x_own_selection, x_handle_selection_clear)
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
85106
diff
changeset
|
3163 for (list = maps; CONSP (list); list = XCDR (list)) |
5551
2b8f405f5103
(describe_map_tree): New arg NOMENU.
Richard M. Stallman <rms@gnu.org>
parents:
5367
diff
changeset
|
3164 { |
2b8f405f5103
(describe_map_tree): New arg NOMENU.
Richard M. Stallman <rms@gnu.org>
parents:
5367
diff
changeset
|
3165 Lisp_Object elt, prefix, tem; |
2b8f405f5103
(describe_map_tree): New arg NOMENU.
Richard M. Stallman <rms@gnu.org>
parents:
5367
diff
changeset
|
3166 |
85372
f7d19cfed7da
* xselect.c (x_own_selection, x_handle_selection_clear)
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
85106
diff
changeset
|
3167 elt = XCAR (list); |
5551
2b8f405f5103
(describe_map_tree): New arg NOMENU.
Richard M. Stallman <rms@gnu.org>
parents:
5367
diff
changeset
|
3168 prefix = Fcar (elt); |
2b8f405f5103
(describe_map_tree): New arg NOMENU.
Richard M. Stallman <rms@gnu.org>
parents:
5367
diff
changeset
|
3169 if (XVECTOR (prefix)->size >= 1) |
2b8f405f5103
(describe_map_tree): New arg NOMENU.
Richard M. Stallman <rms@gnu.org>
parents:
5367
diff
changeset
|
3170 { |
2b8f405f5103
(describe_map_tree): New arg NOMENU.
Richard M. Stallman <rms@gnu.org>
parents:
5367
diff
changeset
|
3171 tem = Faref (prefix, make_number (0)); |
2b8f405f5103
(describe_map_tree): New arg NOMENU.
Richard M. Stallman <rms@gnu.org>
parents:
5367
diff
changeset
|
3172 if (EQ (tem, Qmenu_bar)) |
2b8f405f5103
(describe_map_tree): New arg NOMENU.
Richard M. Stallman <rms@gnu.org>
parents:
5367
diff
changeset
|
3173 maps = Fdelq (elt, maps); |
2b8f405f5103
(describe_map_tree): New arg NOMENU.
Richard M. Stallman <rms@gnu.org>
parents:
5367
diff
changeset
|
3174 } |
2b8f405f5103
(describe_map_tree): New arg NOMENU.
Richard M. Stallman <rms@gnu.org>
parents:
5367
diff
changeset
|
3175 } |
2b8f405f5103
(describe_map_tree): New arg NOMENU.
Richard M. Stallman <rms@gnu.org>
parents:
5367
diff
changeset
|
3176 } |
2b8f405f5103
(describe_map_tree): New arg NOMENU.
Richard M. Stallman <rms@gnu.org>
parents:
5367
diff
changeset
|
3177 |
13245
2e0c4159e94b
(describe_map_tree): New arg always_title. Callers changed.
Richard M. Stallman <rms@gnu.org>
parents:
13201
diff
changeset
|
3178 if (!NILP (maps) || always_title) |
3952
f9dfc2872fb0
(describe_map_tree): Insert key_heading here.
Richard M. Stallman <rms@gnu.org>
parents:
3908
diff
changeset
|
3179 { |
f9dfc2872fb0
(describe_map_tree): Insert key_heading here.
Richard M. Stallman <rms@gnu.org>
parents:
3908
diff
changeset
|
3180 if (title) |
4023
5e4f918d5d44
(describe_map_tree): When inserting TITLE, mention PREFIX.
Richard M. Stallman <rms@gnu.org>
parents:
3962
diff
changeset
|
3181 { |
5e4f918d5d44
(describe_map_tree): When inserting TITLE, mention PREFIX.
Richard M. Stallman <rms@gnu.org>
parents:
3962
diff
changeset
|
3182 insert_string (title); |
5e4f918d5d44
(describe_map_tree): When inserting TITLE, mention PREFIX.
Richard M. Stallman <rms@gnu.org>
parents:
3962
diff
changeset
|
3183 if (!NILP (prefix)) |
5e4f918d5d44
(describe_map_tree): When inserting TITLE, mention PREFIX.
Richard M. Stallman <rms@gnu.org>
parents:
3962
diff
changeset
|
3184 { |
5e4f918d5d44
(describe_map_tree): When inserting TITLE, mention PREFIX.
Richard M. Stallman <rms@gnu.org>
parents:
3962
diff
changeset
|
3185 insert_string (" Starting With "); |
54925
f0a7441d22f6
(Fkey_description): Add optional PREFIX arg.
Kim F. Storm <storm@cua.dk>
parents:
53808
diff
changeset
|
3186 insert1 (Fkey_description (prefix, Qnil)); |
4023
5e4f918d5d44
(describe_map_tree): When inserting TITLE, mention PREFIX.
Richard M. Stallman <rms@gnu.org>
parents:
3962
diff
changeset
|
3187 } |
5e4f918d5d44
(describe_map_tree): When inserting TITLE, mention PREFIX.
Richard M. Stallman <rms@gnu.org>
parents:
3962
diff
changeset
|
3188 insert_string (":\n"); |
5e4f918d5d44
(describe_map_tree): When inserting TITLE, mention PREFIX.
Richard M. Stallman <rms@gnu.org>
parents:
3962
diff
changeset
|
3189 } |
3952
f9dfc2872fb0
(describe_map_tree): Insert key_heading here.
Richard M. Stallman <rms@gnu.org>
parents:
3908
diff
changeset
|
3190 insert_string (key_heading); |
4023
5e4f918d5d44
(describe_map_tree): When inserting TITLE, mention PREFIX.
Richard M. Stallman <rms@gnu.org>
parents:
3962
diff
changeset
|
3191 something = 1; |
3952
f9dfc2872fb0
(describe_map_tree): Insert key_heading here.
Richard M. Stallman <rms@gnu.org>
parents:
3908
diff
changeset
|
3192 } |
f9dfc2872fb0
(describe_map_tree): Insert key_heading here.
Richard M. Stallman <rms@gnu.org>
parents:
3908
diff
changeset
|
3193 |
85372
f7d19cfed7da
* xselect.c (x_own_selection, x_handle_selection_clear)
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
85106
diff
changeset
|
3194 for (; CONSP (maps); maps = XCDR (maps)) |
250 | 3195 { |
7184
caac285c072d
(describe_map_tree): gcpro some things.
Karl Heuer <kwzh@gnu.org>
parents:
7183
diff
changeset
|
3196 register Lisp_Object elt, prefix, tail; |
3952
f9dfc2872fb0
(describe_map_tree): Insert key_heading here.
Richard M. Stallman <rms@gnu.org>
parents:
3908
diff
changeset
|
3197 |
85372
f7d19cfed7da
* xselect.c (x_own_selection, x_handle_selection_clear)
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
85106
diff
changeset
|
3198 elt = XCAR (maps); |
3952
f9dfc2872fb0
(describe_map_tree): Insert key_heading here.
Richard M. Stallman <rms@gnu.org>
parents:
3908
diff
changeset
|
3199 prefix = Fcar (elt); |
250 | 3200 |
3952
f9dfc2872fb0
(describe_map_tree): Insert key_heading here.
Richard M. Stallman <rms@gnu.org>
parents:
3908
diff
changeset
|
3201 sub_shadows = Qnil; |
f9dfc2872fb0
(describe_map_tree): Insert key_heading here.
Richard M. Stallman <rms@gnu.org>
parents:
3908
diff
changeset
|
3202 |
25662
0a7261c1d487
Use XCAR, XCDR, and XFLOAT_DATA instead of explicit member access.
Ken Raeburn <raeburn@raeburn.org>
parents:
25600
diff
changeset
|
3203 for (tail = shadow; CONSP (tail); tail = XCDR (tail)) |
3952
f9dfc2872fb0
(describe_map_tree): Insert key_heading here.
Richard M. Stallman <rms@gnu.org>
parents:
3908
diff
changeset
|
3204 { |
f9dfc2872fb0
(describe_map_tree): Insert key_heading here.
Richard M. Stallman <rms@gnu.org>
parents:
3908
diff
changeset
|
3205 Lisp_Object shmap; |
f9dfc2872fb0
(describe_map_tree): Insert key_heading here.
Richard M. Stallman <rms@gnu.org>
parents:
3908
diff
changeset
|
3206 |
25662
0a7261c1d487
Use XCAR, XCDR, and XFLOAT_DATA instead of explicit member access.
Ken Raeburn <raeburn@raeburn.org>
parents:
25600
diff
changeset
|
3207 shmap = XCAR (tail); |
250 | 3208 |
3952
f9dfc2872fb0
(describe_map_tree): Insert key_heading here.
Richard M. Stallman <rms@gnu.org>
parents:
3908
diff
changeset
|
3209 /* If the sequence by which we reach this keymap is zero-length, |
f9dfc2872fb0
(describe_map_tree): Insert key_heading here.
Richard M. Stallman <rms@gnu.org>
parents:
3908
diff
changeset
|
3210 then the shadow map for this keymap is just SHADOW. */ |
46370
40db0673e6f0
Most uses of XSTRING combined with STRING_BYTES or indirection changed to
Ken Raeburn <raeburn@raeburn.org>
parents:
46310
diff
changeset
|
3211 if ((STRINGP (prefix) && SCHARS (prefix) == 0) |
9123
c225137ddefb
(get_keyelt, store_in_keymap, Fcopy_keymap, Fdefine_key, Flookup_key,
Karl Heuer <kwzh@gnu.org>
parents:
8922
diff
changeset
|
3212 || (VECTORP (prefix) && XVECTOR (prefix)->size == 0)) |
3952
f9dfc2872fb0
(describe_map_tree): Insert key_heading here.
Richard M. Stallman <rms@gnu.org>
parents:
3908
diff
changeset
|
3213 ; |
f9dfc2872fb0
(describe_map_tree): Insert key_heading here.
Richard M. Stallman <rms@gnu.org>
parents:
3908
diff
changeset
|
3214 /* If the sequence by which we reach this keymap actually has |
f9dfc2872fb0
(describe_map_tree): Insert key_heading here.
Richard M. Stallman <rms@gnu.org>
parents:
3908
diff
changeset
|
3215 some elements, then the sequence's definition in SHADOW is |
f9dfc2872fb0
(describe_map_tree): Insert key_heading here.
Richard M. Stallman <rms@gnu.org>
parents:
3908
diff
changeset
|
3216 what we should use. */ |
f9dfc2872fb0
(describe_map_tree): Insert key_heading here.
Richard M. Stallman <rms@gnu.org>
parents:
3908
diff
changeset
|
3217 else |
f9dfc2872fb0
(describe_map_tree): Insert key_heading here.
Richard M. Stallman <rms@gnu.org>
parents:
3908
diff
changeset
|
3218 { |
6859
f34b91fa388c
(describe_map_tree): Fix call to Flookup_key.
Richard M. Stallman <rms@gnu.org>
parents:
6834
diff
changeset
|
3219 shmap = Flookup_key (shmap, Fcar (elt), Qt); |
9123
c225137ddefb
(get_keyelt, store_in_keymap, Fcopy_keymap, Fdefine_key, Flookup_key,
Karl Heuer <kwzh@gnu.org>
parents:
8922
diff
changeset
|
3220 if (INTEGERP (shmap)) |
3952
f9dfc2872fb0
(describe_map_tree): Insert key_heading here.
Richard M. Stallman <rms@gnu.org>
parents:
3908
diff
changeset
|
3221 shmap = Qnil; |
f9dfc2872fb0
(describe_map_tree): Insert key_heading here.
Richard M. Stallman <rms@gnu.org>
parents:
3908
diff
changeset
|
3222 } |
250 | 3223 |
3952
f9dfc2872fb0
(describe_map_tree): Insert key_heading here.
Richard M. Stallman <rms@gnu.org>
parents:
3908
diff
changeset
|
3224 /* If shmap is not nil and not a keymap, |
f9dfc2872fb0
(describe_map_tree): Insert key_heading here.
Richard M. Stallman <rms@gnu.org>
parents:
3908
diff
changeset
|
3225 it completely shadows this map, so don't |
f9dfc2872fb0
(describe_map_tree): Insert key_heading here.
Richard M. Stallman <rms@gnu.org>
parents:
3908
diff
changeset
|
3226 describe this map at all. */ |
32988
c3435dc00ed7
* lisp.h (KEYMAPP): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
32889
diff
changeset
|
3227 if (!NILP (shmap) && !KEYMAPP (shmap)) |
3952
f9dfc2872fb0
(describe_map_tree): Insert key_heading here.
Richard M. Stallman <rms@gnu.org>
parents:
3908
diff
changeset
|
3228 goto skip; |
f9dfc2872fb0
(describe_map_tree): Insert key_heading here.
Richard M. Stallman <rms@gnu.org>
parents:
3908
diff
changeset
|
3229 |
f9dfc2872fb0
(describe_map_tree): Insert key_heading here.
Richard M. Stallman <rms@gnu.org>
parents:
3908
diff
changeset
|
3230 if (!NILP (shmap)) |
f9dfc2872fb0
(describe_map_tree): Insert key_heading here.
Richard M. Stallman <rms@gnu.org>
parents:
3908
diff
changeset
|
3231 sub_shadows = Fcons (shmap, sub_shadows); |
250 | 3232 } |
3233 | |
20883
4aeabf3b8f98
(describe_map_tree): Add the maps we have already
Richard M. Stallman <rms@gnu.org>
parents:
20850
diff
changeset
|
3234 /* Maps we have already listed in this loop shadow this map. */ |
39689
0572449a62be
(Fkeymap_prompt, Fcurrent_active_maps): New funs.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
39682
diff
changeset
|
3235 for (tail = orig_maps; !EQ (tail, maps); tail = XCDR (tail)) |
20883
4aeabf3b8f98
(describe_map_tree): Add the maps we have already
Richard M. Stallman <rms@gnu.org>
parents:
20850
diff
changeset
|
3236 { |
4aeabf3b8f98
(describe_map_tree): Add the maps we have already
Richard M. Stallman <rms@gnu.org>
parents:
20850
diff
changeset
|
3237 Lisp_Object tem; |
4aeabf3b8f98
(describe_map_tree): Add the maps we have already
Richard M. Stallman <rms@gnu.org>
parents:
20850
diff
changeset
|
3238 tem = Fequal (Fcar (XCAR (tail)), prefix); |
39689
0572449a62be
(Fkeymap_prompt, Fcurrent_active_maps): New funs.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
39682
diff
changeset
|
3239 if (!NILP (tem)) |
20883
4aeabf3b8f98
(describe_map_tree): Add the maps we have already
Richard M. Stallman <rms@gnu.org>
parents:
20850
diff
changeset
|
3240 sub_shadows = Fcons (XCDR (XCAR (tail)), sub_shadows); |
4aeabf3b8f98
(describe_map_tree): Add the maps we have already
Richard M. Stallman <rms@gnu.org>
parents:
20850
diff
changeset
|
3241 } |
4aeabf3b8f98
(describe_map_tree): Add the maps we have already
Richard M. Stallman <rms@gnu.org>
parents:
20850
diff
changeset
|
3242 |
4aeabf3b8f98
(describe_map_tree): Add the maps we have already
Richard M. Stallman <rms@gnu.org>
parents:
20850
diff
changeset
|
3243 describe_map (Fcdr (elt), prefix, |
12710
26c09987d2f3
(describe_buffer_bindings): Print bindings from
Richard M. Stallman <rms@gnu.org>
parents:
12542
diff
changeset
|
3244 transl ? describe_translation : describe_command, |
60066
eca75f16d020
(describe_map_tree): New arg MENTION_SHADOW. Calls changed.
Richard M. Stallman <rms@gnu.org>
parents:
59754
diff
changeset
|
3245 partial, sub_shadows, &seen, nomenu, mention_shadow); |
3952
f9dfc2872fb0
(describe_map_tree): Insert key_heading here.
Richard M. Stallman <rms@gnu.org>
parents:
3908
diff
changeset
|
3246 |
f9dfc2872fb0
(describe_map_tree): Insert key_heading here.
Richard M. Stallman <rms@gnu.org>
parents:
3908
diff
changeset
|
3247 skip: ; |
250 | 3248 } |
3249 | |
4023
5e4f918d5d44
(describe_map_tree): When inserting TITLE, mention PREFIX.
Richard M. Stallman <rms@gnu.org>
parents:
3962
diff
changeset
|
3250 if (something) |
5e4f918d5d44
(describe_map_tree): When inserting TITLE, mention PREFIX.
Richard M. Stallman <rms@gnu.org>
parents:
3962
diff
changeset
|
3251 insert_string ("\n"); |
5e4f918d5d44
(describe_map_tree): When inserting TITLE, mention PREFIX.
Richard M. Stallman <rms@gnu.org>
parents:
3962
diff
changeset
|
3252 |
250 | 3253 UNGCPRO; |
3254 } | |
3255 | |
14304
57194b6a555d
(Faccessible_keymaps): Doc fix.
Karl Heuer <kwzh@gnu.org>
parents:
14186
diff
changeset
|
3256 static int previous_description_column; |
57194b6a555d
(Faccessible_keymaps): Doc fix.
Karl Heuer <kwzh@gnu.org>
parents:
14186
diff
changeset
|
3257 |
250 | 3258 static void |
109126
aec1143e8d85
Convert (most) functions in src to standard C.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
109100
diff
changeset
|
3259 describe_command (Lisp_Object definition, Lisp_Object args) |
250 | 3260 { |
3261 register Lisp_Object tem1; | |
45619
dbd65bd8bb4f
(describe_command): Cast `current_column' return value to int.
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
45404
diff
changeset
|
3262 int column = (int) current_column (); /* iftc */ |
14304
57194b6a555d
(Faccessible_keymaps): Doc fix.
Karl Heuer <kwzh@gnu.org>
parents:
14186
diff
changeset
|
3263 int description_column; |
57194b6a555d
(Faccessible_keymaps): Doc fix.
Karl Heuer <kwzh@gnu.org>
parents:
14186
diff
changeset
|
3264 |
57194b6a555d
(Faccessible_keymaps): Doc fix.
Karl Heuer <kwzh@gnu.org>
parents:
14186
diff
changeset
|
3265 /* If column 16 is no good, go to col 32; |
57194b6a555d
(Faccessible_keymaps): Doc fix.
Karl Heuer <kwzh@gnu.org>
parents:
14186
diff
changeset
|
3266 but don't push beyond that--go to next line instead. */ |
57194b6a555d
(Faccessible_keymaps): Doc fix.
Karl Heuer <kwzh@gnu.org>
parents:
14186
diff
changeset
|
3267 if (column > 30) |
57194b6a555d
(Faccessible_keymaps): Doc fix.
Karl Heuer <kwzh@gnu.org>
parents:
14186
diff
changeset
|
3268 { |
57194b6a555d
(Faccessible_keymaps): Doc fix.
Karl Heuer <kwzh@gnu.org>
parents:
14186
diff
changeset
|
3269 insert_char ('\n'); |
57194b6a555d
(Faccessible_keymaps): Doc fix.
Karl Heuer <kwzh@gnu.org>
parents:
14186
diff
changeset
|
3270 description_column = 32; |
57194b6a555d
(Faccessible_keymaps): Doc fix.
Karl Heuer <kwzh@gnu.org>
parents:
14186
diff
changeset
|
3271 } |
57194b6a555d
(Faccessible_keymaps): Doc fix.
Karl Heuer <kwzh@gnu.org>
parents:
14186
diff
changeset
|
3272 else if (column > 14 || (column > 10 && previous_description_column == 32)) |
57194b6a555d
(Faccessible_keymaps): Doc fix.
Karl Heuer <kwzh@gnu.org>
parents:
14186
diff
changeset
|
3273 description_column = 32; |
57194b6a555d
(Faccessible_keymaps): Doc fix.
Karl Heuer <kwzh@gnu.org>
parents:
14186
diff
changeset
|
3274 else |
57194b6a555d
(Faccessible_keymaps): Doc fix.
Karl Heuer <kwzh@gnu.org>
parents:
14186
diff
changeset
|
3275 description_column = 16; |
57194b6a555d
(Faccessible_keymaps): Doc fix.
Karl Heuer <kwzh@gnu.org>
parents:
14186
diff
changeset
|
3276 |
57194b6a555d
(Faccessible_keymaps): Doc fix.
Karl Heuer <kwzh@gnu.org>
parents:
14186
diff
changeset
|
3277 Findent_to (make_number (description_column), make_number (1)); |
57194b6a555d
(Faccessible_keymaps): Doc fix.
Karl Heuer <kwzh@gnu.org>
parents:
14186
diff
changeset
|
3278 previous_description_column = description_column; |
250 | 3279 |
9123
c225137ddefb
(get_keyelt, store_in_keymap, Fcopy_keymap, Fdefine_key, Flookup_key,
Karl Heuer <kwzh@gnu.org>
parents:
8922
diff
changeset
|
3280 if (SYMBOLP (definition)) |
250 | 3281 { |
45404
3885467d7b12
* keymap.c (silly_event_symbol_error, Fsingle_key_description)
Ken Raeburn <raeburn@raeburn.org>
parents:
45279
diff
changeset
|
3282 tem1 = SYMBOL_NAME (definition); |
250 | 3283 insert1 (tem1); |
21539
b9606d56f91f
Revert erroneous 1998-04-08 change.
Dave Love <fx@gnu.org>
parents:
21514
diff
changeset
|
3284 insert_string ("\n"); |
250 | 3285 } |
12710
26c09987d2f3
(describe_buffer_bindings): Print bindings from
Richard M. Stallman <rms@gnu.org>
parents:
12542
diff
changeset
|
3286 else if (STRINGP (definition) || VECTORP (definition)) |
5367
e4f5f2674f34
(describe_command): If binding is a kbd macro, say so.
Richard M. Stallman <rms@gnu.org>
parents:
5246
diff
changeset
|
3287 insert_string ("Keyboard Macro\n"); |
32988
c3435dc00ed7
* lisp.h (KEYMAPP): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
32889
diff
changeset
|
3288 else if (KEYMAPP (definition)) |
c3435dc00ed7
* lisp.h (KEYMAPP): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
32889
diff
changeset
|
3289 insert_string ("Prefix Command\n"); |
250 | 3290 else |
32988
c3435dc00ed7
* lisp.h (KEYMAPP): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
32889
diff
changeset
|
3291 insert_string ("??\n"); |
250 | 3292 } |
3293 | |
12710
26c09987d2f3
(describe_buffer_bindings): Print bindings from
Richard M. Stallman <rms@gnu.org>
parents:
12542
diff
changeset
|
3294 static void |
109126
aec1143e8d85
Convert (most) functions in src to standard C.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
109100
diff
changeset
|
3295 describe_translation (Lisp_Object definition, Lisp_Object args) |
12710
26c09987d2f3
(describe_buffer_bindings): Print bindings from
Richard M. Stallman <rms@gnu.org>
parents:
12542
diff
changeset
|
3296 { |
26c09987d2f3
(describe_buffer_bindings): Print bindings from
Richard M. Stallman <rms@gnu.org>
parents:
12542
diff
changeset
|
3297 register Lisp_Object tem1; |
26c09987d2f3
(describe_buffer_bindings): Print bindings from
Richard M. Stallman <rms@gnu.org>
parents:
12542
diff
changeset
|
3298 |
26c09987d2f3
(describe_buffer_bindings): Print bindings from
Richard M. Stallman <rms@gnu.org>
parents:
12542
diff
changeset
|
3299 Findent_to (make_number (16), make_number (1)); |
26c09987d2f3
(describe_buffer_bindings): Print bindings from
Richard M. Stallman <rms@gnu.org>
parents:
12542
diff
changeset
|
3300 |
26c09987d2f3
(describe_buffer_bindings): Print bindings from
Richard M. Stallman <rms@gnu.org>
parents:
12542
diff
changeset
|
3301 if (SYMBOLP (definition)) |
26c09987d2f3
(describe_buffer_bindings): Print bindings from
Richard M. Stallman <rms@gnu.org>
parents:
12542
diff
changeset
|
3302 { |
45404
3885467d7b12
* keymap.c (silly_event_symbol_error, Fsingle_key_description)
Ken Raeburn <raeburn@raeburn.org>
parents:
45279
diff
changeset
|
3303 tem1 = SYMBOL_NAME (definition); |
12710
26c09987d2f3
(describe_buffer_bindings): Print bindings from
Richard M. Stallman <rms@gnu.org>
parents:
12542
diff
changeset
|
3304 insert1 (tem1); |
26c09987d2f3
(describe_buffer_bindings): Print bindings from
Richard M. Stallman <rms@gnu.org>
parents:
12542
diff
changeset
|
3305 insert_string ("\n"); |
26c09987d2f3
(describe_buffer_bindings): Print bindings from
Richard M. Stallman <rms@gnu.org>
parents:
12542
diff
changeset
|
3306 } |
26c09987d2f3
(describe_buffer_bindings): Print bindings from
Richard M. Stallman <rms@gnu.org>
parents:
12542
diff
changeset
|
3307 else if (STRINGP (definition) || VECTORP (definition)) |
13343
cc0f24bdfab1
(describe_translation): Insert newline after key description.
Richard M. Stallman <rms@gnu.org>
parents:
13245
diff
changeset
|
3308 { |
54925
f0a7441d22f6
(Fkey_description): Add optional PREFIX arg.
Kim F. Storm <storm@cua.dk>
parents:
53808
diff
changeset
|
3309 insert1 (Fkey_description (definition, Qnil)); |
13343
cc0f24bdfab1
(describe_translation): Insert newline after key description.
Richard M. Stallman <rms@gnu.org>
parents:
13245
diff
changeset
|
3310 insert_string ("\n"); |
cc0f24bdfab1
(describe_translation): Insert newline after key description.
Richard M. Stallman <rms@gnu.org>
parents:
13245
diff
changeset
|
3311 } |
32988
c3435dc00ed7
* lisp.h (KEYMAPP): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
32889
diff
changeset
|
3312 else if (KEYMAPP (definition)) |
c3435dc00ed7
* lisp.h (KEYMAPP): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
32889
diff
changeset
|
3313 insert_string ("Prefix Command\n"); |
12710
26c09987d2f3
(describe_buffer_bindings): Print bindings from
Richard M. Stallman <rms@gnu.org>
parents:
12542
diff
changeset
|
3314 else |
32988
c3435dc00ed7
* lisp.h (KEYMAPP): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
32889
diff
changeset
|
3315 insert_string ("??\n"); |
12710
26c09987d2f3
(describe_buffer_bindings): Print bindings from
Richard M. Stallman <rms@gnu.org>
parents:
12542
diff
changeset
|
3316 } |
26c09987d2f3
(describe_buffer_bindings): Print bindings from
Richard M. Stallman <rms@gnu.org>
parents:
12542
diff
changeset
|
3317 |
67904
d2dff317d618
(describe_map): Put sparse map elements into an array,
Richard M. Stallman <rms@gnu.org>
parents:
67674
diff
changeset
|
3318 /* describe_map puts all the usable elements of a sparse keymap |
d2dff317d618
(describe_map): Put sparse map elements into an array,
Richard M. Stallman <rms@gnu.org>
parents:
67674
diff
changeset
|
3319 into an array of `struct describe_map_elt', |
d2dff317d618
(describe_map): Put sparse map elements into an array,
Richard M. Stallman <rms@gnu.org>
parents:
67674
diff
changeset
|
3320 then sorts them by the events. */ |
d2dff317d618
(describe_map): Put sparse map elements into an array,
Richard M. Stallman <rms@gnu.org>
parents:
67674
diff
changeset
|
3321 |
d2dff317d618
(describe_map): Put sparse map elements into an array,
Richard M. Stallman <rms@gnu.org>
parents:
67674
diff
changeset
|
3322 struct describe_map_elt { Lisp_Object event; Lisp_Object definition; int shadowed; }; |
d2dff317d618
(describe_map): Put sparse map elements into an array,
Richard M. Stallman <rms@gnu.org>
parents:
67674
diff
changeset
|
3323 |
d2dff317d618
(describe_map): Put sparse map elements into an array,
Richard M. Stallman <rms@gnu.org>
parents:
67674
diff
changeset
|
3324 /* qsort comparison function for sorting `struct describe_map_elt' by |
d2dff317d618
(describe_map): Put sparse map elements into an array,
Richard M. Stallman <rms@gnu.org>
parents:
67674
diff
changeset
|
3325 the event field. */ |
d2dff317d618
(describe_map): Put sparse map elements into an array,
Richard M. Stallman <rms@gnu.org>
parents:
67674
diff
changeset
|
3326 |
d2dff317d618
(describe_map): Put sparse map elements into an array,
Richard M. Stallman <rms@gnu.org>
parents:
67674
diff
changeset
|
3327 static int |
109126
aec1143e8d85
Convert (most) functions in src to standard C.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
109100
diff
changeset
|
3328 describe_map_compare (const void *aa, const void *bb) |
67904
d2dff317d618
(describe_map): Put sparse map elements into an array,
Richard M. Stallman <rms@gnu.org>
parents:
67674
diff
changeset
|
3329 { |
d2dff317d618
(describe_map): Put sparse map elements into an array,
Richard M. Stallman <rms@gnu.org>
parents:
67674
diff
changeset
|
3330 const struct describe_map_elt *a = aa, *b = bb; |
d2dff317d618
(describe_map): Put sparse map elements into an array,
Richard M. Stallman <rms@gnu.org>
parents:
67674
diff
changeset
|
3331 if (INTEGERP (a->event) && INTEGERP (b->event)) |
d2dff317d618
(describe_map): Put sparse map elements into an array,
Richard M. Stallman <rms@gnu.org>
parents:
67674
diff
changeset
|
3332 return ((XINT (a->event) > XINT (b->event)) |
d2dff317d618
(describe_map): Put sparse map elements into an array,
Richard M. Stallman <rms@gnu.org>
parents:
67674
diff
changeset
|
3333 - (XINT (a->event) < XINT (b->event))); |
d2dff317d618
(describe_map): Put sparse map elements into an array,
Richard M. Stallman <rms@gnu.org>
parents:
67674
diff
changeset
|
3334 if (!INTEGERP (a->event) && INTEGERP (b->event)) |
d2dff317d618
(describe_map): Put sparse map elements into an array,
Richard M. Stallman <rms@gnu.org>
parents:
67674
diff
changeset
|
3335 return 1; |
d2dff317d618
(describe_map): Put sparse map elements into an array,
Richard M. Stallman <rms@gnu.org>
parents:
67674
diff
changeset
|
3336 if (INTEGERP (a->event) && !INTEGERP (b->event)) |
d2dff317d618
(describe_map): Put sparse map elements into an array,
Richard M. Stallman <rms@gnu.org>
parents:
67674
diff
changeset
|
3337 return -1; |
d2dff317d618
(describe_map): Put sparse map elements into an array,
Richard M. Stallman <rms@gnu.org>
parents:
67674
diff
changeset
|
3338 if (SYMBOLP (a->event) && SYMBOLP (b->event)) |
67994
2e977adcc0e5
(describe_map_compare): Yet another int/Lisp_Object mixup.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
67904
diff
changeset
|
3339 return (!NILP (Fstring_lessp (a->event, b->event)) ? -1 |
2e977adcc0e5
(describe_map_compare): Yet another int/Lisp_Object mixup.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
67904
diff
changeset
|
3340 : !NILP (Fstring_lessp (b->event, a->event)) ? 1 |
67904
d2dff317d618
(describe_map): Put sparse map elements into an array,
Richard M. Stallman <rms@gnu.org>
parents:
67674
diff
changeset
|
3341 : 0); |
d2dff317d618
(describe_map): Put sparse map elements into an array,
Richard M. Stallman <rms@gnu.org>
parents:
67674
diff
changeset
|
3342 return 0; |
d2dff317d618
(describe_map): Put sparse map elements into an array,
Richard M. Stallman <rms@gnu.org>
parents:
67674
diff
changeset
|
3343 } |
d2dff317d618
(describe_map): Put sparse map elements into an array,
Richard M. Stallman <rms@gnu.org>
parents:
67674
diff
changeset
|
3344 |
6974
ab22b527d380
(describe_map): Merge with describe_map_2.
Karl Heuer <kwzh@gnu.org>
parents:
6859
diff
changeset
|
3345 /* Describe the contents of map MAP, assuming that this map itself is |
54925
f0a7441d22f6
(Fkey_description): Add optional PREFIX arg.
Kim F. Storm <storm@cua.dk>
parents:
53808
diff
changeset
|
3346 reached by the sequence of prefix keys PREFIX (a string or vector). |
14129
d0b95da4f1f2
(describe_map): New arg nomenu.
Karl Heuer <kwzh@gnu.org>
parents:
14099
diff
changeset
|
3347 PARTIAL, SHADOW, NOMENU are as in `describe_map_tree' above. */ |
250 | 3348 |
3349 static void | |
109364
89a16701cde1
Convert old-style definitions
Andreas Schwab <schwab@linux-m68k.org>
parents:
109302
diff
changeset
|
3350 describe_map (Lisp_Object map, Lisp_Object prefix, |
89a16701cde1
Convert old-style definitions
Andreas Schwab <schwab@linux-m68k.org>
parents:
109302
diff
changeset
|
3351 void (*elt_describer) (Lisp_Object, Lisp_Object), |
89a16701cde1
Convert old-style definitions
Andreas Schwab <schwab@linux-m68k.org>
parents:
109302
diff
changeset
|
3352 int partial, Lisp_Object shadow, |
89a16701cde1
Convert old-style definitions
Andreas Schwab <schwab@linux-m68k.org>
parents:
109302
diff
changeset
|
3353 Lisp_Object *seen, int nomenu, int mention_shadow) |
250 | 3354 { |
3952
f9dfc2872fb0
(describe_map_tree): Insert key_heading here.
Richard M. Stallman <rms@gnu.org>
parents:
3908
diff
changeset
|
3355 Lisp_Object tail, definition, event; |
3908
a148b4ff79c6
(describe_map_2): Cleanups.
Richard M. Stallman <rms@gnu.org>
parents:
3735
diff
changeset
|
3356 Lisp_Object tem; |
250 | 3357 Lisp_Object suppress; |
3358 Lisp_Object kludge; | |
3359 int first = 1; | |
3360 struct gcpro gcpro1, gcpro2, gcpro3; | |
3361 | |
67904
d2dff317d618
(describe_map): Put sparse map elements into an array,
Richard M. Stallman <rms@gnu.org>
parents:
67674
diff
changeset
|
3362 /* These accumulate the values from sparse keymap bindings, |
d2dff317d618
(describe_map): Put sparse map elements into an array,
Richard M. Stallman <rms@gnu.org>
parents:
67674
diff
changeset
|
3363 so we can sort them and handle them in order. */ |
d2dff317d618
(describe_map): Put sparse map elements into an array,
Richard M. Stallman <rms@gnu.org>
parents:
67674
diff
changeset
|
3364 int length_needed = 0; |
d2dff317d618
(describe_map): Put sparse map elements into an array,
Richard M. Stallman <rms@gnu.org>
parents:
67674
diff
changeset
|
3365 struct describe_map_elt *vect; |
d2dff317d618
(describe_map): Put sparse map elements into an array,
Richard M. Stallman <rms@gnu.org>
parents:
67674
diff
changeset
|
3366 int slots_used = 0; |
d2dff317d618
(describe_map): Put sparse map elements into an array,
Richard M. Stallman <rms@gnu.org>
parents:
67674
diff
changeset
|
3367 int i; |
d2dff317d618
(describe_map): Put sparse map elements into an array,
Richard M. Stallman <rms@gnu.org>
parents:
67674
diff
changeset
|
3368 |
31829
43566b0aec59
Avoid some more compiler warnings.
Gerd Moellmann <gerd@gnu.org>
parents:
31496
diff
changeset
|
3369 suppress = Qnil; |
43566b0aec59
Avoid some more compiler warnings.
Gerd Moellmann <gerd@gnu.org>
parents:
31496
diff
changeset
|
3370 |
250 | 3371 if (partial) |
3372 suppress = intern ("suppress-keymap"); | |
3373 | |
3374 /* This vector gets used to present single keys to Flookup_key. Since | |
1209
1aa2cd425737
* keymap.c (DENSE_TABLE_SIZE): Doc fix.
Jim Blandy <jimb@redhat.com>
parents:
1160
diff
changeset
|
3375 that is done once per keymap element, we don't want to cons up a |
250 | 3376 fresh vector every time. */ |
3377 kludge = Fmake_vector (make_number (1), Qnil); | |
3908
a148b4ff79c6
(describe_map_2): Cleanups.
Richard M. Stallman <rms@gnu.org>
parents:
3735
diff
changeset
|
3378 definition = Qnil; |
250 | 3379 |
93664
c7dd307b0ec5
* subr.el (keymap-canonicalize): New function.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
93205
diff
changeset
|
3380 GCPRO3 (prefix, definition, kludge); |
c7dd307b0ec5
* subr.el (keymap-canonicalize): New function.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
93205
diff
changeset
|
3381 |
c7dd307b0ec5
* subr.el (keymap-canonicalize): New function.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
93205
diff
changeset
|
3382 map = call1 (Qkeymap_canonicalize, map); |
c7dd307b0ec5
* subr.el (keymap-canonicalize): New function.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
93205
diff
changeset
|
3383 |
67904
d2dff317d618
(describe_map): Put sparse map elements into an array,
Richard M. Stallman <rms@gnu.org>
parents:
67674
diff
changeset
|
3384 for (tail = map; CONSP (tail); tail = XCDR (tail)) |
d2dff317d618
(describe_map): Put sparse map elements into an array,
Richard M. Stallman <rms@gnu.org>
parents:
67674
diff
changeset
|
3385 length_needed++; |
d2dff317d618
(describe_map): Put sparse map elements into an array,
Richard M. Stallman <rms@gnu.org>
parents:
67674
diff
changeset
|
3386 |
d2dff317d618
(describe_map): Put sparse map elements into an array,
Richard M. Stallman <rms@gnu.org>
parents:
67674
diff
changeset
|
3387 vect = ((struct describe_map_elt *) |
d2dff317d618
(describe_map): Put sparse map elements into an array,
Richard M. Stallman <rms@gnu.org>
parents:
67674
diff
changeset
|
3388 alloca (sizeof (struct describe_map_elt) * length_needed)); |
d2dff317d618
(describe_map): Put sparse map elements into an array,
Richard M. Stallman <rms@gnu.org>
parents:
67674
diff
changeset
|
3389 |
25662
0a7261c1d487
Use XCAR, XCDR, and XFLOAT_DATA instead of explicit member access.
Ken Raeburn <raeburn@raeburn.org>
parents:
25600
diff
changeset
|
3390 for (tail = map; CONSP (tail); tail = XCDR (tail)) |
250 | 3391 { |
3392 QUIT; | |
3393 | |
25662
0a7261c1d487
Use XCAR, XCDR, and XFLOAT_DATA instead of explicit member access.
Ken Raeburn <raeburn@raeburn.org>
parents:
25600
diff
changeset
|
3394 if (VECTORP (XCAR (tail)) |
0a7261c1d487
Use XCAR, XCDR, and XFLOAT_DATA instead of explicit member access.
Ken Raeburn <raeburn@raeburn.org>
parents:
25600
diff
changeset
|
3395 || CHAR_TABLE_P (XCAR (tail))) |
0a7261c1d487
Use XCAR, XCDR, and XFLOAT_DATA instead of explicit member access.
Ken Raeburn <raeburn@raeburn.org>
parents:
25600
diff
changeset
|
3396 describe_vector (XCAR (tail), |
54925
f0a7441d22f6
(Fkey_description): Add optional PREFIX arg.
Kim F. Storm <storm@cua.dk>
parents:
53808
diff
changeset
|
3397 prefix, Qnil, elt_describer, partial, shadow, map, |
60066
eca75f16d020
(describe_map_tree): New arg MENTION_SHADOW. Calls changed.
Richard M. Stallman <rms@gnu.org>
parents:
59754
diff
changeset
|
3398 (int *)0, 0, 1, mention_shadow); |
25662
0a7261c1d487
Use XCAR, XCDR, and XFLOAT_DATA instead of explicit member access.
Ken Raeburn <raeburn@raeburn.org>
parents:
25600
diff
changeset
|
3399 else if (CONSP (XCAR (tail))) |
250 | 3400 { |
60066
eca75f16d020
(describe_map_tree): New arg MENTION_SHADOW. Calls changed.
Richard M. Stallman <rms@gnu.org>
parents:
59754
diff
changeset
|
3401 int this_shadowed = 0; |
67904
d2dff317d618
(describe_map): Put sparse map elements into an array,
Richard M. Stallman <rms@gnu.org>
parents:
67674
diff
changeset
|
3402 |
25662
0a7261c1d487
Use XCAR, XCDR, and XFLOAT_DATA instead of explicit member access.
Ken Raeburn <raeburn@raeburn.org>
parents:
25600
diff
changeset
|
3403 event = XCAR (XCAR (tail)); |
7341
516dd16e2017
(describe_map): Ignore bindings for all except symbols and integers.
Richard M. Stallman <rms@gnu.org>
parents:
7191
diff
changeset
|
3404 |
54925
f0a7441d22f6
(Fkey_description): Add optional PREFIX arg.
Kim F. Storm <storm@cua.dk>
parents:
53808
diff
changeset
|
3405 /* Ignore bindings whose "prefix" are not really valid events. |
7341
516dd16e2017
(describe_map): Ignore bindings for all except symbols and integers.
Richard M. Stallman <rms@gnu.org>
parents:
7191
diff
changeset
|
3406 (We get these in the frames and buffers menu.) */ |
39689
0572449a62be
(Fkeymap_prompt, Fcurrent_active_maps): New funs.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
39682
diff
changeset
|
3407 if (!(SYMBOLP (event) || INTEGERP (event))) |
7191
bd2f9c5ee54e
(Fsingle_key_description): Undo previous change.
Karl Heuer <kwzh@gnu.org>
parents:
7186
diff
changeset
|
3408 continue; |
7341
516dd16e2017
(describe_map): Ignore bindings for all except symbols and integers.
Richard M. Stallman <rms@gnu.org>
parents:
7191
diff
changeset
|
3409 |
14129
d0b95da4f1f2
(describe_map): New arg nomenu.
Karl Heuer <kwzh@gnu.org>
parents:
14099
diff
changeset
|
3410 if (nomenu && EQ (event, Qmenu_bar)) |
d0b95da4f1f2
(describe_map): New arg nomenu.
Karl Heuer <kwzh@gnu.org>
parents:
14099
diff
changeset
|
3411 continue; |
d0b95da4f1f2
(describe_map): New arg nomenu.
Karl Heuer <kwzh@gnu.org>
parents:
14099
diff
changeset
|
3412 |
25662
0a7261c1d487
Use XCAR, XCDR, and XFLOAT_DATA instead of explicit member access.
Ken Raeburn <raeburn@raeburn.org>
parents:
25600
diff
changeset
|
3413 definition = get_keyelt (XCDR (XCAR (tail)), 0); |
250 | 3414 |
1209
1aa2cd425737
* keymap.c (DENSE_TABLE_SIZE): Doc fix.
Jim Blandy <jimb@redhat.com>
parents:
1160
diff
changeset
|
3415 /* Don't show undefined commands or suppressed commands. */ |
3908
a148b4ff79c6
(describe_map_2): Cleanups.
Richard M. Stallman <rms@gnu.org>
parents:
3735
diff
changeset
|
3416 if (NILP (definition)) continue; |
9123
c225137ddefb
(get_keyelt, store_in_keymap, Fcopy_keymap, Fdefine_key, Flookup_key,
Karl Heuer <kwzh@gnu.org>
parents:
8922
diff
changeset
|
3417 if (SYMBOLP (definition) && partial) |
1209
1aa2cd425737
* keymap.c (DENSE_TABLE_SIZE): Doc fix.
Jim Blandy <jimb@redhat.com>
parents:
1160
diff
changeset
|
3418 { |
3908
a148b4ff79c6
(describe_map_2): Cleanups.
Richard M. Stallman <rms@gnu.org>
parents:
3735
diff
changeset
|
3419 tem = Fget (definition, suppress); |
a148b4ff79c6
(describe_map_2): Cleanups.
Richard M. Stallman <rms@gnu.org>
parents:
3735
diff
changeset
|
3420 if (!NILP (tem)) |
1209
1aa2cd425737
* keymap.c (DENSE_TABLE_SIZE): Doc fix.
Jim Blandy <jimb@redhat.com>
parents:
1160
diff
changeset
|
3421 continue; |
1aa2cd425737
* keymap.c (DENSE_TABLE_SIZE): Doc fix.
Jim Blandy <jimb@redhat.com>
parents:
1160
diff
changeset
|
3422 } |
250 | 3423 |
1209
1aa2cd425737
* keymap.c (DENSE_TABLE_SIZE): Doc fix.
Jim Blandy <jimb@redhat.com>
parents:
1160
diff
changeset
|
3424 /* Don't show a command that isn't really visible |
1aa2cd425737
* keymap.c (DENSE_TABLE_SIZE): Doc fix.
Jim Blandy <jimb@redhat.com>
parents:
1160
diff
changeset
|
3425 because a local definition of the same key shadows it. */ |
250 | 3426 |
32846
c1b3ab2a1ccc
Use AREF, ASET and ASIZE macros.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
32844
diff
changeset
|
3427 ASET (kludge, 0, event); |
1209
1aa2cd425737
* keymap.c (DENSE_TABLE_SIZE): Doc fix.
Jim Blandy <jimb@redhat.com>
parents:
1160
diff
changeset
|
3428 if (!NILP (shadow)) |
1aa2cd425737
* keymap.c (DENSE_TABLE_SIZE): Doc fix.
Jim Blandy <jimb@redhat.com>
parents:
1160
diff
changeset
|
3429 { |
106972
d026329addd9
* keymap.c (shadow_lookup): Add `remap' arg.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
106815
diff
changeset
|
3430 tem = shadow_lookup (shadow, kludge, Qt, 0); |
60066
eca75f16d020
(describe_map_tree): New arg MENTION_SHADOW. Calls changed.
Richard M. Stallman <rms@gnu.org>
parents:
59754
diff
changeset
|
3431 if (!NILP (tem)) |
eca75f16d020
(describe_map_tree): New arg MENTION_SHADOW. Calls changed.
Richard M. Stallman <rms@gnu.org>
parents:
59754
diff
changeset
|
3432 { |
75393
42d89518722a
(describe_map): Don't consider prefix keys to be shadowed.
Kim F. Storm <storm@cua.dk>
parents:
75348
diff
changeset
|
3433 /* If both bindings are keymaps, this key is a prefix key, |
42d89518722a
(describe_map): Don't consider prefix keys to be shadowed.
Kim F. Storm <storm@cua.dk>
parents:
75348
diff
changeset
|
3434 so don't say it is shadowed. */ |
42d89518722a
(describe_map): Don't consider prefix keys to be shadowed.
Kim F. Storm <storm@cua.dk>
parents:
75348
diff
changeset
|
3435 if (KEYMAPP (definition) && KEYMAPP (tem)) |
42d89518722a
(describe_map): Don't consider prefix keys to be shadowed.
Kim F. Storm <storm@cua.dk>
parents:
75348
diff
changeset
|
3436 ; |
70554
e1a064810f6f
* keymap.c (describe_map): Avoid generating duplicate entries if
Chong Yidong <cyd@stupidchicken.com>
parents:
70536
diff
changeset
|
3437 /* Avoid generating duplicate entries if the |
75393
42d89518722a
(describe_map): Don't consider prefix keys to be shadowed.
Kim F. Storm <storm@cua.dk>
parents:
75348
diff
changeset
|
3438 shadowed binding has the same definition. */ |
42d89518722a
(describe_map): Don't consider prefix keys to be shadowed.
Kim F. Storm <storm@cua.dk>
parents:
75348
diff
changeset
|
3439 else if (mention_shadow && !EQ (tem, definition)) |
60066
eca75f16d020
(describe_map_tree): New arg MENTION_SHADOW. Calls changed.
Richard M. Stallman <rms@gnu.org>
parents:
59754
diff
changeset
|
3440 this_shadowed = 1; |
eca75f16d020
(describe_map_tree): New arg MENTION_SHADOW. Calls changed.
Richard M. Stallman <rms@gnu.org>
parents:
59754
diff
changeset
|
3441 else |
eca75f16d020
(describe_map_tree): New arg MENTION_SHADOW. Calls changed.
Richard M. Stallman <rms@gnu.org>
parents:
59754
diff
changeset
|
3442 continue; |
eca75f16d020
(describe_map_tree): New arg MENTION_SHADOW. Calls changed.
Richard M. Stallman <rms@gnu.org>
parents:
59754
diff
changeset
|
3443 } |
1209
1aa2cd425737
* keymap.c (DENSE_TABLE_SIZE): Doc fix.
Jim Blandy <jimb@redhat.com>
parents:
1160
diff
changeset
|
3444 } |
250 | 3445 |
6974
ab22b527d380
(describe_map): Merge with describe_map_2.
Karl Heuer <kwzh@gnu.org>
parents:
6859
diff
changeset
|
3446 tem = Flookup_key (map, kludge, Qt); |
39689
0572449a62be
(Fkeymap_prompt, Fcurrent_active_maps): New funs.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
39682
diff
changeset
|
3447 if (!EQ (tem, definition)) continue; |
3908
a148b4ff79c6
(describe_map_2): Cleanups.
Richard M. Stallman <rms@gnu.org>
parents:
3735
diff
changeset
|
3448 |
67904
d2dff317d618
(describe_map): Put sparse map elements into an array,
Richard M. Stallman <rms@gnu.org>
parents:
67674
diff
changeset
|
3449 vect[slots_used].event = event; |
d2dff317d618
(describe_map): Put sparse map elements into an array,
Richard M. Stallman <rms@gnu.org>
parents:
67674
diff
changeset
|
3450 vect[slots_used].definition = definition; |
d2dff317d618
(describe_map): Put sparse map elements into an array,
Richard M. Stallman <rms@gnu.org>
parents:
67674
diff
changeset
|
3451 vect[slots_used].shadowed = this_shadowed; |
d2dff317d618
(describe_map): Put sparse map elements into an array,
Richard M. Stallman <rms@gnu.org>
parents:
67674
diff
changeset
|
3452 slots_used++; |
1209
1aa2cd425737
* keymap.c (DENSE_TABLE_SIZE): Doc fix.
Jim Blandy <jimb@redhat.com>
parents:
1160
diff
changeset
|
3453 } |
25662
0a7261c1d487
Use XCAR, XCDR, and XFLOAT_DATA instead of explicit member access.
Ken Raeburn <raeburn@raeburn.org>
parents:
25600
diff
changeset
|
3454 else if (EQ (XCAR (tail), Qkeymap)) |
6976
4d540eeb2dd5
(describe_map_tree, describe_map): Skip keymaps we've seen before.
Karl Heuer <kwzh@gnu.org>
parents:
6974
diff
changeset
|
3455 { |
4d540eeb2dd5
(describe_map_tree, describe_map): Skip keymaps we've seen before.
Karl Heuer <kwzh@gnu.org>
parents:
6974
diff
changeset
|
3456 /* The same keymap might be in the structure twice, if we're |
4d540eeb2dd5
(describe_map_tree, describe_map): Skip keymaps we've seen before.
Karl Heuer <kwzh@gnu.org>
parents:
6974
diff
changeset
|
3457 using an inherited keymap. So skip anything we've already |
4d540eeb2dd5
(describe_map_tree, describe_map): Skip keymaps we've seen before.
Karl Heuer <kwzh@gnu.org>
parents:
6974
diff
changeset
|
3458 encountered. */ |
4d540eeb2dd5
(describe_map_tree, describe_map): Skip keymaps we've seen before.
Karl Heuer <kwzh@gnu.org>
parents:
6974
diff
changeset
|
3459 tem = Fassq (tail, *seen); |
54925
f0a7441d22f6
(Fkey_description): Add optional PREFIX arg.
Kim F. Storm <storm@cua.dk>
parents:
53808
diff
changeset
|
3460 if (CONSP (tem) && !NILP (Fequal (XCAR (tem), prefix))) |
6976
4d540eeb2dd5
(describe_map_tree, describe_map): Skip keymaps we've seen before.
Karl Heuer <kwzh@gnu.org>
parents:
6974
diff
changeset
|
3461 break; |
54925
f0a7441d22f6
(Fkey_description): Add optional PREFIX arg.
Kim F. Storm <storm@cua.dk>
parents:
53808
diff
changeset
|
3462 *seen = Fcons (Fcons (tail, prefix), *seen); |
6976
4d540eeb2dd5
(describe_map_tree, describe_map): Skip keymaps we've seen before.
Karl Heuer <kwzh@gnu.org>
parents:
6974
diff
changeset
|
3463 } |
250 | 3464 } |
3465 | |
67904
d2dff317d618
(describe_map): Put sparse map elements into an array,
Richard M. Stallman <rms@gnu.org>
parents:
67674
diff
changeset
|
3466 /* If we found some sparse map events, sort them. */ |
d2dff317d618
(describe_map): Put sparse map elements into an array,
Richard M. Stallman <rms@gnu.org>
parents:
67674
diff
changeset
|
3467 |
d2dff317d618
(describe_map): Put sparse map elements into an array,
Richard M. Stallman <rms@gnu.org>
parents:
67674
diff
changeset
|
3468 qsort (vect, slots_used, sizeof (struct describe_map_elt), |
d2dff317d618
(describe_map): Put sparse map elements into an array,
Richard M. Stallman <rms@gnu.org>
parents:
67674
diff
changeset
|
3469 describe_map_compare); |
d2dff317d618
(describe_map): Put sparse map elements into an array,
Richard M. Stallman <rms@gnu.org>
parents:
67674
diff
changeset
|
3470 |
d2dff317d618
(describe_map): Put sparse map elements into an array,
Richard M. Stallman <rms@gnu.org>
parents:
67674
diff
changeset
|
3471 /* Now output them in sorted order. */ |
d2dff317d618
(describe_map): Put sparse map elements into an array,
Richard M. Stallman <rms@gnu.org>
parents:
67674
diff
changeset
|
3472 |
d2dff317d618
(describe_map): Put sparse map elements into an array,
Richard M. Stallman <rms@gnu.org>
parents:
67674
diff
changeset
|
3473 for (i = 0; i < slots_used; i++) |
d2dff317d618
(describe_map): Put sparse map elements into an array,
Richard M. Stallman <rms@gnu.org>
parents:
67674
diff
changeset
|
3474 { |
d2dff317d618
(describe_map): Put sparse map elements into an array,
Richard M. Stallman <rms@gnu.org>
parents:
67674
diff
changeset
|
3475 Lisp_Object start, end; |
d2dff317d618
(describe_map): Put sparse map elements into an array,
Richard M. Stallman <rms@gnu.org>
parents:
67674
diff
changeset
|
3476 |
d2dff317d618
(describe_map): Put sparse map elements into an array,
Richard M. Stallman <rms@gnu.org>
parents:
67674
diff
changeset
|
3477 if (first) |
d2dff317d618
(describe_map): Put sparse map elements into an array,
Richard M. Stallman <rms@gnu.org>
parents:
67674
diff
changeset
|
3478 { |
d2dff317d618
(describe_map): Put sparse map elements into an array,
Richard M. Stallman <rms@gnu.org>
parents:
67674
diff
changeset
|
3479 previous_description_column = 0; |
d2dff317d618
(describe_map): Put sparse map elements into an array,
Richard M. Stallman <rms@gnu.org>
parents:
67674
diff
changeset
|
3480 insert ("\n", 1); |
d2dff317d618
(describe_map): Put sparse map elements into an array,
Richard M. Stallman <rms@gnu.org>
parents:
67674
diff
changeset
|
3481 first = 0; |
d2dff317d618
(describe_map): Put sparse map elements into an array,
Richard M. Stallman <rms@gnu.org>
parents:
67674
diff
changeset
|
3482 } |
d2dff317d618
(describe_map): Put sparse map elements into an array,
Richard M. Stallman <rms@gnu.org>
parents:
67674
diff
changeset
|
3483 |
d2dff317d618
(describe_map): Put sparse map elements into an array,
Richard M. Stallman <rms@gnu.org>
parents:
67674
diff
changeset
|
3484 ASET (kludge, 0, vect[i].event); |
d2dff317d618
(describe_map): Put sparse map elements into an array,
Richard M. Stallman <rms@gnu.org>
parents:
67674
diff
changeset
|
3485 start = vect[i].event; |
d2dff317d618
(describe_map): Put sparse map elements into an array,
Richard M. Stallman <rms@gnu.org>
parents:
67674
diff
changeset
|
3486 end = start; |
d2dff317d618
(describe_map): Put sparse map elements into an array,
Richard M. Stallman <rms@gnu.org>
parents:
67674
diff
changeset
|
3487 |
d2dff317d618
(describe_map): Put sparse map elements into an array,
Richard M. Stallman <rms@gnu.org>
parents:
67674
diff
changeset
|
3488 definition = vect[i].definition; |
d2dff317d618
(describe_map): Put sparse map elements into an array,
Richard M. Stallman <rms@gnu.org>
parents:
67674
diff
changeset
|
3489 |
d2dff317d618
(describe_map): Put sparse map elements into an array,
Richard M. Stallman <rms@gnu.org>
parents:
67674
diff
changeset
|
3490 /* Find consecutive chars that are identically defined. */ |
d2dff317d618
(describe_map): Put sparse map elements into an array,
Richard M. Stallman <rms@gnu.org>
parents:
67674
diff
changeset
|
3491 if (INTEGERP (vect[i].event)) |
d2dff317d618
(describe_map): Put sparse map elements into an array,
Richard M. Stallman <rms@gnu.org>
parents:
67674
diff
changeset
|
3492 { |
d2dff317d618
(describe_map): Put sparse map elements into an array,
Richard M. Stallman <rms@gnu.org>
parents:
67674
diff
changeset
|
3493 while (i + 1 < slots_used |
69870
bc9116711ea3
(describe_map): Don't use XINT if we haven't checked INTEGERP.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
69596
diff
changeset
|
3494 && EQ (vect[i+1].event, make_number (XINT (vect[i].event) + 1)) |
67904
d2dff317d618
(describe_map): Put sparse map elements into an array,
Richard M. Stallman <rms@gnu.org>
parents:
67674
diff
changeset
|
3495 && !NILP (Fequal (vect[i + 1].definition, definition)) |
d2dff317d618
(describe_map): Put sparse map elements into an array,
Richard M. Stallman <rms@gnu.org>
parents:
67674
diff
changeset
|
3496 && vect[i].shadowed == vect[i + 1].shadowed) |
d2dff317d618
(describe_map): Put sparse map elements into an array,
Richard M. Stallman <rms@gnu.org>
parents:
67674
diff
changeset
|
3497 i++; |
d2dff317d618
(describe_map): Put sparse map elements into an array,
Richard M. Stallman <rms@gnu.org>
parents:
67674
diff
changeset
|
3498 end = vect[i].event; |
d2dff317d618
(describe_map): Put sparse map elements into an array,
Richard M. Stallman <rms@gnu.org>
parents:
67674
diff
changeset
|
3499 } |
d2dff317d618
(describe_map): Put sparse map elements into an array,
Richard M. Stallman <rms@gnu.org>
parents:
67674
diff
changeset
|
3500 |
d2dff317d618
(describe_map): Put sparse map elements into an array,
Richard M. Stallman <rms@gnu.org>
parents:
67674
diff
changeset
|
3501 /* Now START .. END is the range to describe next. */ |
d2dff317d618
(describe_map): Put sparse map elements into an array,
Richard M. Stallman <rms@gnu.org>
parents:
67674
diff
changeset
|
3502 |
d2dff317d618
(describe_map): Put sparse map elements into an array,
Richard M. Stallman <rms@gnu.org>
parents:
67674
diff
changeset
|
3503 /* Insert the string to describe the event START. */ |
d2dff317d618
(describe_map): Put sparse map elements into an array,
Richard M. Stallman <rms@gnu.org>
parents:
67674
diff
changeset
|
3504 insert1 (Fkey_description (kludge, prefix)); |
d2dff317d618
(describe_map): Put sparse map elements into an array,
Richard M. Stallman <rms@gnu.org>
parents:
67674
diff
changeset
|
3505 |
d2dff317d618
(describe_map): Put sparse map elements into an array,
Richard M. Stallman <rms@gnu.org>
parents:
67674
diff
changeset
|
3506 if (!EQ (start, end)) |
d2dff317d618
(describe_map): Put sparse map elements into an array,
Richard M. Stallman <rms@gnu.org>
parents:
67674
diff
changeset
|
3507 { |
d2dff317d618
(describe_map): Put sparse map elements into an array,
Richard M. Stallman <rms@gnu.org>
parents:
67674
diff
changeset
|
3508 insert (" .. ", 4); |
d2dff317d618
(describe_map): Put sparse map elements into an array,
Richard M. Stallman <rms@gnu.org>
parents:
67674
diff
changeset
|
3509 |
d2dff317d618
(describe_map): Put sparse map elements into an array,
Richard M. Stallman <rms@gnu.org>
parents:
67674
diff
changeset
|
3510 ASET (kludge, 0, end); |
d2dff317d618
(describe_map): Put sparse map elements into an array,
Richard M. Stallman <rms@gnu.org>
parents:
67674
diff
changeset
|
3511 /* Insert the string to describe the character END. */ |
d2dff317d618
(describe_map): Put sparse map elements into an array,
Richard M. Stallman <rms@gnu.org>
parents:
67674
diff
changeset
|
3512 insert1 (Fkey_description (kludge, prefix)); |
d2dff317d618
(describe_map): Put sparse map elements into an array,
Richard M. Stallman <rms@gnu.org>
parents:
67674
diff
changeset
|
3513 } |
d2dff317d618
(describe_map): Put sparse map elements into an array,
Richard M. Stallman <rms@gnu.org>
parents:
67674
diff
changeset
|
3514 |
d2dff317d618
(describe_map): Put sparse map elements into an array,
Richard M. Stallman <rms@gnu.org>
parents:
67674
diff
changeset
|
3515 /* Print a description of the definition of this character. |
d2dff317d618
(describe_map): Put sparse map elements into an array,
Richard M. Stallman <rms@gnu.org>
parents:
67674
diff
changeset
|
3516 elt_describer will take care of spacing out far enough |
d2dff317d618
(describe_map): Put sparse map elements into an array,
Richard M. Stallman <rms@gnu.org>
parents:
67674
diff
changeset
|
3517 for alignment purposes. */ |
d2dff317d618
(describe_map): Put sparse map elements into an array,
Richard M. Stallman <rms@gnu.org>
parents:
67674
diff
changeset
|
3518 (*elt_describer) (vect[i].definition, Qnil); |
d2dff317d618
(describe_map): Put sparse map elements into an array,
Richard M. Stallman <rms@gnu.org>
parents:
67674
diff
changeset
|
3519 |
d2dff317d618
(describe_map): Put sparse map elements into an array,
Richard M. Stallman <rms@gnu.org>
parents:
67674
diff
changeset
|
3520 if (vect[i].shadowed) |
d2dff317d618
(describe_map): Put sparse map elements into an array,
Richard M. Stallman <rms@gnu.org>
parents:
67674
diff
changeset
|
3521 { |
d2dff317d618
(describe_map): Put sparse map elements into an array,
Richard M. Stallman <rms@gnu.org>
parents:
67674
diff
changeset
|
3522 SET_PT (PT - 1); |
70083
61d8c79b3c79
(describe_map): Make "shadowed" warning more verbose.
Richard M. Stallman <rms@gnu.org>
parents:
69870
diff
changeset
|
3523 insert_string ("\n (that binding is currently shadowed by another mode)"); |
67904
d2dff317d618
(describe_map): Put sparse map elements into an array,
Richard M. Stallman <rms@gnu.org>
parents:
67674
diff
changeset
|
3524 SET_PT (PT + 1); |
d2dff317d618
(describe_map): Put sparse map elements into an array,
Richard M. Stallman <rms@gnu.org>
parents:
67674
diff
changeset
|
3525 } |
d2dff317d618
(describe_map): Put sparse map elements into an array,
Richard M. Stallman <rms@gnu.org>
parents:
67674
diff
changeset
|
3526 } |
d2dff317d618
(describe_map): Put sparse map elements into an array,
Richard M. Stallman <rms@gnu.org>
parents:
67674
diff
changeset
|
3527 |
250 | 3528 UNGCPRO; |
3529 } | |
3530 | |
20319
81424cf4d446
(copy_keymap_1): Fix return type.
Andreas Schwab <schwab@suse.de>
parents:
20076
diff
changeset
|
3531 static void |
109126
aec1143e8d85
Convert (most) functions in src to standard C.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
109100
diff
changeset
|
3532 describe_vector_princ (Lisp_Object elt, Lisp_Object fun) |
250 | 3533 { |
3691
49ce2242f5c1
(get_keymap_1): Add missing semicolon.
Richard M. Stallman <rms@gnu.org>
parents:
3674
diff
changeset
|
3534 Findent_to (make_number (16), make_number (1)); |
41293
3db86c7bf56f
(Fdescribe_vector): Add `describer' parameter.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
41001
diff
changeset
|
3535 call1 (fun, elt); |
3632
72cfde0cd8cd
(Fdescribe_vector): Use current buf, not standard-output.
Richard M. Stallman <rms@gnu.org>
parents:
3542
diff
changeset
|
3536 Fterpri (Qnil); |
250 | 3537 } |
3538 | |
41293
3db86c7bf56f
(Fdescribe_vector): Add `describer' parameter.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
41001
diff
changeset
|
3539 DEFUN ("describe-vector", Fdescribe_vector, Sdescribe_vector, 1, 2, 0, |
41001
a17c8b15ef1b
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
40804
diff
changeset
|
3540 doc: /* Insert a description of contents of VECTOR. |
55913
c663e2e97168
(Fdescribe_vector): Fix docstring.
Juanma Barranquero <lekktu@gmail.com>
parents:
55722
diff
changeset
|
3541 This is text showing the elements of vector matched against indices. |
c663e2e97168
(Fdescribe_vector): Fix docstring.
Juanma Barranquero <lekktu@gmail.com>
parents:
55722
diff
changeset
|
3542 DESCRIBER is the output function used; nil means use `princ'. */) |
109179
8cfee7d2955f
Convert DEFUNs to standard C.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
109165
diff
changeset
|
3543 (Lisp_Object vector, Lisp_Object describer) |
250 | 3544 { |
46293
1fb8f75062c6
Use macro SPECPDL_INDEX.
Juanma Barranquero <lekktu@gmail.com>
parents:
46142
diff
changeset
|
3545 int count = SPECPDL_INDEX (); |
41293
3db86c7bf56f
(Fdescribe_vector): Add `describer' parameter.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
41001
diff
changeset
|
3546 if (NILP (describer)) |
3db86c7bf56f
(Fdescribe_vector): Add `describer' parameter.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
41001
diff
changeset
|
3547 describer = intern ("princ"); |
3632
72cfde0cd8cd
(Fdescribe_vector): Use current buf, not standard-output.
Richard M. Stallman <rms@gnu.org>
parents:
3542
diff
changeset
|
3548 specbind (Qstandard_output, Fcurrent_buffer ()); |
40656
cdfd4d09b79a
Update usage of CHECK_ macros (remove unused second argument).
Pavel Janík <Pavel@Janik.cz>
parents:
40625
diff
changeset
|
3549 CHECK_VECTOR_OR_CHAR_TABLE (vector); |
41293
3db86c7bf56f
(Fdescribe_vector): Add `describer' parameter.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
41001
diff
changeset
|
3550 describe_vector (vector, Qnil, describer, describe_vector_princ, 0, |
60066
eca75f16d020
(describe_map_tree): New arg MENTION_SHADOW. Calls changed.
Richard M. Stallman <rms@gnu.org>
parents:
59754
diff
changeset
|
3551 Qnil, Qnil, (int *)0, 0, 0, 0); |
3632
72cfde0cd8cd
(Fdescribe_vector): Use current buf, not standard-output.
Richard M. Stallman <rms@gnu.org>
parents:
3542
diff
changeset
|
3552 |
72cfde0cd8cd
(Fdescribe_vector): Use current buf, not standard-output.
Richard M. Stallman <rms@gnu.org>
parents:
3542
diff
changeset
|
3553 return unbind_to (count, Qnil); |
250 | 3554 } |
3555 | |
13201
e9007fec678e
(describe_vector): Support nested char-tables.
Richard M. Stallman <rms@gnu.org>
parents:
13145
diff
changeset
|
3556 /* Insert in the current buffer a description of the contents of VECTOR. |
e9007fec678e
(describe_vector): Support nested char-tables.
Richard M. Stallman <rms@gnu.org>
parents:
13145
diff
changeset
|
3557 We call ELT_DESCRIBER to insert the description of one value found |
e9007fec678e
(describe_vector): Support nested char-tables.
Richard M. Stallman <rms@gnu.org>
parents:
13145
diff
changeset
|
3558 in VECTOR. |
e9007fec678e
(describe_vector): Support nested char-tables.
Richard M. Stallman <rms@gnu.org>
parents:
13145
diff
changeset
|
3559 |
e9007fec678e
(describe_vector): Support nested char-tables.
Richard M. Stallman <rms@gnu.org>
parents:
13145
diff
changeset
|
3560 ELT_PREFIX describes what "comes before" the keys or indices defined |
17788
208d71ea3a4f
(get_keyelt): Handle an indirect entry with meta char.
Richard M. Stallman <rms@gnu.org>
parents:
17511
diff
changeset
|
3561 by this vector. This is a human-readable string whose size |
208d71ea3a4f
(get_keyelt): Handle an indirect entry with meta char.
Richard M. Stallman <rms@gnu.org>
parents:
17511
diff
changeset
|
3562 is not necessarily related to the situation. |
13201
e9007fec678e
(describe_vector): Support nested char-tables.
Richard M. Stallman <rms@gnu.org>
parents:
13145
diff
changeset
|
3563 |
e9007fec678e
(describe_vector): Support nested char-tables.
Richard M. Stallman <rms@gnu.org>
parents:
13145
diff
changeset
|
3564 If the vector is in a keymap, ELT_PREFIX is a prefix key which |
e9007fec678e
(describe_vector): Support nested char-tables.
Richard M. Stallman <rms@gnu.org>
parents:
13145
diff
changeset
|
3565 leads to this keymap. |
e9007fec678e
(describe_vector): Support nested char-tables.
Richard M. Stallman <rms@gnu.org>
parents:
13145
diff
changeset
|
3566 |
e9007fec678e
(describe_vector): Support nested char-tables.
Richard M. Stallman <rms@gnu.org>
parents:
13145
diff
changeset
|
3567 If the vector is a chartable, ELT_PREFIX is the vector |
e9007fec678e
(describe_vector): Support nested char-tables.
Richard M. Stallman <rms@gnu.org>
parents:
13145
diff
changeset
|
3568 of bytes that lead to the character set or portion of a character |
e9007fec678e
(describe_vector): Support nested char-tables.
Richard M. Stallman <rms@gnu.org>
parents:
13145
diff
changeset
|
3569 set described by this chartable. |
e9007fec678e
(describe_vector): Support nested char-tables.
Richard M. Stallman <rms@gnu.org>
parents:
13145
diff
changeset
|
3570 |
e9007fec678e
(describe_vector): Support nested char-tables.
Richard M. Stallman <rms@gnu.org>
parents:
13145
diff
changeset
|
3571 If PARTIAL is nonzero, it means do not mention suppressed commands |
e9007fec678e
(describe_vector): Support nested char-tables.
Richard M. Stallman <rms@gnu.org>
parents:
13145
diff
changeset
|
3572 (that assumes the vector is in a keymap). |
e9007fec678e
(describe_vector): Support nested char-tables.
Richard M. Stallman <rms@gnu.org>
parents:
13145
diff
changeset
|
3573 |
e9007fec678e
(describe_vector): Support nested char-tables.
Richard M. Stallman <rms@gnu.org>
parents:
13145
diff
changeset
|
3574 SHADOW is a list of keymaps that shadow this map. |
e9007fec678e
(describe_vector): Support nested char-tables.
Richard M. Stallman <rms@gnu.org>
parents:
13145
diff
changeset
|
3575 If it is non-nil, then we look up the key in those maps |
e9007fec678e
(describe_vector): Support nested char-tables.
Richard M. Stallman <rms@gnu.org>
parents:
13145
diff
changeset
|
3576 and we don't mention it now if it is defined by any of them. |
e9007fec678e
(describe_vector): Support nested char-tables.
Richard M. Stallman <rms@gnu.org>
parents:
13145
diff
changeset
|
3577 |
e9007fec678e
(describe_vector): Support nested char-tables.
Richard M. Stallman <rms@gnu.org>
parents:
13145
diff
changeset
|
3578 ENTIRE_MAP is the keymap in which this vector appears. |
e9007fec678e
(describe_vector): Support nested char-tables.
Richard M. Stallman <rms@gnu.org>
parents:
13145
diff
changeset
|
3579 If the definition in effect in the whole map does not match |
17788
208d71ea3a4f
(get_keyelt): Handle an indirect entry with meta char.
Richard M. Stallman <rms@gnu.org>
parents:
17511
diff
changeset
|
3580 the one in this vector, we ignore this one. |
208d71ea3a4f
(get_keyelt): Handle an indirect entry with meta char.
Richard M. Stallman <rms@gnu.org>
parents:
17511
diff
changeset
|
3581 |
88380 | 3582 ARGS is simply passed as the second argument to ELT_DESCRIBER. |
3583 | |
3584 INDICES and CHAR_TABLE_DEPTH are ignored. They will be removed in | |
89943
4c90ffeb71c5
Revision: miles@gnu.org--gnu-2004/emacs--unicode--0--patch-15
Miles Bader <miles@gnu.org>
diff
changeset
|
3585 the near future. |
41293
3db86c7bf56f
(Fdescribe_vector): Add `describer' parameter.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
41001
diff
changeset
|
3586 |
54925
f0a7441d22f6
(Fkey_description): Add optional PREFIX arg.
Kim F. Storm <storm@cua.dk>
parents:
53808
diff
changeset
|
3587 KEYMAP_P is 1 if vector is known to be a keymap, so map ESC to M-. |
f0a7441d22f6
(Fkey_description): Add optional PREFIX arg.
Kim F. Storm <storm@cua.dk>
parents:
53808
diff
changeset
|
3588 |
41293
3db86c7bf56f
(Fdescribe_vector): Add `describer' parameter.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
41001
diff
changeset
|
3589 ARGS is simply passed as the second argument to ELT_DESCRIBER. */ |
13201
e9007fec678e
(describe_vector): Support nested char-tables.
Richard M. Stallman <rms@gnu.org>
parents:
13145
diff
changeset
|
3590 |
54925
f0a7441d22f6
(Fkey_description): Add optional PREFIX arg.
Kim F. Storm <storm@cua.dk>
parents:
53808
diff
changeset
|
3591 static void |
109364
89a16701cde1
Convert old-style definitions
Andreas Schwab <schwab@linux-m68k.org>
parents:
109302
diff
changeset
|
3592 describe_vector (Lisp_Object vector, Lisp_Object prefix, Lisp_Object args, |
89a16701cde1
Convert old-style definitions
Andreas Schwab <schwab@linux-m68k.org>
parents:
109302
diff
changeset
|
3593 void (*elt_describer) (Lisp_Object, Lisp_Object), |
89a16701cde1
Convert old-style definitions
Andreas Schwab <schwab@linux-m68k.org>
parents:
109302
diff
changeset
|
3594 int partial, Lisp_Object shadow, Lisp_Object entire_map, |
89a16701cde1
Convert old-style definitions
Andreas Schwab <schwab@linux-m68k.org>
parents:
109302
diff
changeset
|
3595 int *indices, int char_table_depth, int keymap_p, |
89a16701cde1
Convert old-style definitions
Andreas Schwab <schwab@linux-m68k.org>
parents:
109302
diff
changeset
|
3596 int mention_shadow) |
250 | 3597 { |
11973
4e0f3e3b4cc7
(describe_vector): New arg entire_map.
Karl Heuer <kwzh@gnu.org>
parents:
11924
diff
changeset
|
3598 Lisp_Object definition; |
4e0f3e3b4cc7
(describe_vector): New arg entire_map.
Karl Heuer <kwzh@gnu.org>
parents:
11924
diff
changeset
|
3599 Lisp_Object tem2; |
54925
f0a7441d22f6
(Fkey_description): Add optional PREFIX arg.
Kim F. Storm <storm@cua.dk>
parents:
53808
diff
changeset
|
3600 Lisp_Object elt_prefix = Qnil; |
88747
f35665df510f
(describe_vector): Handle a char-table directly here.
Kenichi Handa <handa@m17n.org>
parents:
88380
diff
changeset
|
3601 int i; |
250 | 3602 Lisp_Object suppress; |
3603 Lisp_Object kludge; | |
3604 int first = 1; | |
54925
f0a7441d22f6
(Fkey_description): Add optional PREFIX arg.
Kim F. Storm <storm@cua.dk>
parents:
53808
diff
changeset
|
3605 struct gcpro gcpro1, gcpro2, gcpro3, gcpro4; |
17036 | 3606 /* Range of elements to be handled. */ |
99981
ec7ddeda2233
(describe_vector): Adjusted for the change of
Kenichi Handa <handa@m17n.org>
parents:
96747
diff
changeset
|
3607 int from, to, stop; |
88380 | 3608 Lisp_Object character; |
17788
208d71ea3a4f
(get_keyelt): Handle an indirect entry with meta char.
Richard M. Stallman <rms@gnu.org>
parents:
17511
diff
changeset
|
3609 int starting_i; |
208d71ea3a4f
(get_keyelt): Handle an indirect entry with meta char.
Richard M. Stallman <rms@gnu.org>
parents:
17511
diff
changeset
|
3610 |
31829
43566b0aec59
Avoid some more compiler warnings.
Gerd Moellmann <gerd@gnu.org>
parents:
31496
diff
changeset
|
3611 suppress = Qnil; |
43566b0aec59
Avoid some more compiler warnings.
Gerd Moellmann <gerd@gnu.org>
parents:
31496
diff
changeset
|
3612 |
11973
4e0f3e3b4cc7
(describe_vector): New arg entire_map.
Karl Heuer <kwzh@gnu.org>
parents:
11924
diff
changeset
|
3613 definition = Qnil; |
250 | 3614 |
54925
f0a7441d22f6
(Fkey_description): Add optional PREFIX arg.
Kim F. Storm <storm@cua.dk>
parents:
53808
diff
changeset
|
3615 if (!keymap_p) |
f0a7441d22f6
(Fkey_description): Add optional PREFIX arg.
Kim F. Storm <storm@cua.dk>
parents:
53808
diff
changeset
|
3616 { |
f0a7441d22f6
(Fkey_description): Add optional PREFIX arg.
Kim F. Storm <storm@cua.dk>
parents:
53808
diff
changeset
|
3617 /* Call Fkey_description first, to avoid GC bug for the other string. */ |
f0a7441d22f6
(Fkey_description): Add optional PREFIX arg.
Kim F. Storm <storm@cua.dk>
parents:
53808
diff
changeset
|
3618 if (!NILP (prefix) && XFASTINT (Flength (prefix)) > 0) |
f0a7441d22f6
(Fkey_description): Add optional PREFIX arg.
Kim F. Storm <storm@cua.dk>
parents:
53808
diff
changeset
|
3619 { |
f0a7441d22f6
(Fkey_description): Add optional PREFIX arg.
Kim F. Storm <storm@cua.dk>
parents:
53808
diff
changeset
|
3620 Lisp_Object tem; |
f0a7441d22f6
(Fkey_description): Add optional PREFIX arg.
Kim F. Storm <storm@cua.dk>
parents:
53808
diff
changeset
|
3621 tem = Fkey_description (prefix, Qnil); |
f0a7441d22f6
(Fkey_description): Add optional PREFIX arg.
Kim F. Storm <storm@cua.dk>
parents:
53808
diff
changeset
|
3622 elt_prefix = concat2 (tem, build_string (" ")); |
f0a7441d22f6
(Fkey_description): Add optional PREFIX arg.
Kim F. Storm <storm@cua.dk>
parents:
53808
diff
changeset
|
3623 } |
f0a7441d22f6
(Fkey_description): Add optional PREFIX arg.
Kim F. Storm <storm@cua.dk>
parents:
53808
diff
changeset
|
3624 prefix = Qnil; |
f0a7441d22f6
(Fkey_description): Add optional PREFIX arg.
Kim F. Storm <storm@cua.dk>
parents:
53808
diff
changeset
|
3625 } |
f0a7441d22f6
(Fkey_description): Add optional PREFIX arg.
Kim F. Storm <storm@cua.dk>
parents:
53808
diff
changeset
|
3626 |
250 | 3627 /* This vector gets used to present single keys to Flookup_key. Since |
3628 that is done once per vector element, we don't want to cons up a | |
3629 fresh vector every time. */ | |
3630 kludge = Fmake_vector (make_number (1), Qnil); | |
54925
f0a7441d22f6
(Fkey_description): Add optional PREFIX arg.
Kim F. Storm <storm@cua.dk>
parents:
53808
diff
changeset
|
3631 GCPRO4 (elt_prefix, prefix, definition, kludge); |
250 | 3632 |
3633 if (partial) | |
3634 suppress = intern ("suppress-keymap"); | |
3635 | |
88380 | 3636 from = 0; |
99981
ec7ddeda2233
(describe_vector): Adjusted for the change of
Kenichi Handa <handa@m17n.org>
parents:
96747
diff
changeset
|
3637 if (CHAR_TABLE_P (vector)) |
ec7ddeda2233
(describe_vector): Adjusted for the change of
Kenichi Handa <handa@m17n.org>
parents:
96747
diff
changeset
|
3638 stop = MAX_5_BYTE_CHAR + 1, to = MAX_CHAR + 1; |
ec7ddeda2233
(describe_vector): Adjusted for the change of
Kenichi Handa <handa@m17n.org>
parents:
96747
diff
changeset
|
3639 else |
ec7ddeda2233
(describe_vector): Adjusted for the change of
Kenichi Handa <handa@m17n.org>
parents:
96747
diff
changeset
|
3640 stop = to = XVECTOR (vector)->size; |
ec7ddeda2233
(describe_vector): Adjusted for the change of
Kenichi Handa <handa@m17n.org>
parents:
96747
diff
changeset
|
3641 |
ec7ddeda2233
(describe_vector): Adjusted for the change of
Kenichi Handa <handa@m17n.org>
parents:
96747
diff
changeset
|
3642 for (i = from; ; i++) |
250 | 3643 { |
60066
eca75f16d020
(describe_map_tree): New arg MENTION_SHADOW. Calls changed.
Richard M. Stallman <rms@gnu.org>
parents:
59754
diff
changeset
|
3644 int this_shadowed = 0; |
88747
f35665df510f
(describe_vector): Handle a char-table directly here.
Kenichi Handa <handa@m17n.org>
parents:
88380
diff
changeset
|
3645 int range_beg, range_end; |
f35665df510f
(describe_vector): Handle a char-table directly here.
Kenichi Handa <handa@m17n.org>
parents:
88380
diff
changeset
|
3646 Lisp_Object val; |
f35665df510f
(describe_vector): Handle a char-table directly here.
Kenichi Handa <handa@m17n.org>
parents:
88380
diff
changeset
|
3647 |
250 | 3648 QUIT; |
17189
7c008ec99e97
(describe_vector): Adjusted for the change of CHAR_TABLE_ORDINARY_SLOTS.
Kenichi Handa <handa@m17n.org>
parents:
17111
diff
changeset
|
3649 |
99981
ec7ddeda2233
(describe_vector): Adjusted for the change of
Kenichi Handa <handa@m17n.org>
parents:
96747
diff
changeset
|
3650 if (i == stop) |
ec7ddeda2233
(describe_vector): Adjusted for the change of
Kenichi Handa <handa@m17n.org>
parents:
96747
diff
changeset
|
3651 { |
ec7ddeda2233
(describe_vector): Adjusted for the change of
Kenichi Handa <handa@m17n.org>
parents:
96747
diff
changeset
|
3652 if (i == to) |
ec7ddeda2233
(describe_vector): Adjusted for the change of
Kenichi Handa <handa@m17n.org>
parents:
96747
diff
changeset
|
3653 break; |
ec7ddeda2233
(describe_vector): Adjusted for the change of
Kenichi Handa <handa@m17n.org>
parents:
96747
diff
changeset
|
3654 stop = to; |
ec7ddeda2233
(describe_vector): Adjusted for the change of
Kenichi Handa <handa@m17n.org>
parents:
96747
diff
changeset
|
3655 } |
ec7ddeda2233
(describe_vector): Adjusted for the change of
Kenichi Handa <handa@m17n.org>
parents:
96747
diff
changeset
|
3656 |
88747
f35665df510f
(describe_vector): Handle a char-table directly here.
Kenichi Handa <handa@m17n.org>
parents:
88380
diff
changeset
|
3657 starting_i = i; |
f35665df510f
(describe_vector): Handle a char-table directly here.
Kenichi Handa <handa@m17n.org>
parents:
88380
diff
changeset
|
3658 |
17327
0cb065f8702e
(describe_vector): Adjusted for the new structure of Lisp_Char_Table.
Kenichi Handa <handa@m17n.org>
parents:
17264
diff
changeset
|
3659 if (CHAR_TABLE_P (vector)) |
99981
ec7ddeda2233
(describe_vector): Adjusted for the change of
Kenichi Handa <handa@m17n.org>
parents:
96747
diff
changeset
|
3660 { |
ec7ddeda2233
(describe_vector): Adjusted for the change of
Kenichi Handa <handa@m17n.org>
parents:
96747
diff
changeset
|
3661 range_beg = i; |
ec7ddeda2233
(describe_vector): Adjusted for the change of
Kenichi Handa <handa@m17n.org>
parents:
96747
diff
changeset
|
3662 i = stop - 1; |
ec7ddeda2233
(describe_vector): Adjusted for the change of
Kenichi Handa <handa@m17n.org>
parents:
96747
diff
changeset
|
3663 val = char_table_ref_and_range (vector, range_beg, &range_beg, &i); |
ec7ddeda2233
(describe_vector): Adjusted for the change of
Kenichi Handa <handa@m17n.org>
parents:
96747
diff
changeset
|
3664 } |
17327
0cb065f8702e
(describe_vector): Adjusted for the new structure of Lisp_Char_Table.
Kenichi Handa <handa@m17n.org>
parents:
17264
diff
changeset
|
3665 else |
88747
f35665df510f
(describe_vector): Handle a char-table directly here.
Kenichi Handa <handa@m17n.org>
parents:
88380
diff
changeset
|
3666 val = AREF (vector, i); |
f35665df510f
(describe_vector): Handle a char-table directly here.
Kenichi Handa <handa@m17n.org>
parents:
88380
diff
changeset
|
3667 definition = get_keyelt (val, 0); |
250 | 3668 |
41293
3db86c7bf56f
(Fdescribe_vector): Add `describer' parameter.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
41001
diff
changeset
|
3669 if (NILP (definition)) continue; |
17511
10ead0052174
(describe_vector): Test for suppressed commands in
Richard M. Stallman <rms@gnu.org>
parents:
17510
diff
changeset
|
3670 |
250 | 3671 /* Don't mention suppressed commands. */ |
11973
4e0f3e3b4cc7
(describe_vector): New arg entire_map.
Karl Heuer <kwzh@gnu.org>
parents:
11924
diff
changeset
|
3672 if (SYMBOLP (definition) && partial) |
250 | 3673 { |
17036 | 3674 Lisp_Object tem; |
3675 | |
3676 tem = Fget (definition, suppress); | |
3677 | |
3678 if (!NILP (tem)) continue; | |
250 | 3679 } |
3680 | |
88747
f35665df510f
(describe_vector): Handle a char-table directly here.
Kenichi Handa <handa@m17n.org>
parents:
88380
diff
changeset
|
3681 character = make_number (starting_i); |
89943
4c90ffeb71c5
Revision: miles@gnu.org--gnu-2004/emacs--unicode--0--patch-15
Miles Bader <miles@gnu.org>
diff
changeset
|
3682 ASET (kludge, 0, character); |
54925
f0a7441d22f6
(Fkey_description): Add optional PREFIX arg.
Kim F. Storm <storm@cua.dk>
parents:
53808
diff
changeset
|
3683 |
11973
4e0f3e3b4cc7
(describe_vector): New arg entire_map.
Karl Heuer <kwzh@gnu.org>
parents:
11924
diff
changeset
|
3684 /* If this binding is shadowed by some other map, ignore it. */ |
88380 | 3685 if (!NILP (shadow)) |
250 | 3686 { |
3687 Lisp_Object tem; | |
45279
220c13a65624
(keymap_parent): New fun, extracted from Fkeymap_parent.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
45235
diff
changeset
|
3688 |
106972
d026329addd9
* keymap.c (shadow_lookup): Add `remap' arg.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
106815
diff
changeset
|
3689 tem = shadow_lookup (shadow, kludge, Qt, 0); |
250 | 3690 |
60066
eca75f16d020
(describe_map_tree): New arg MENTION_SHADOW. Calls changed.
Richard M. Stallman <rms@gnu.org>
parents:
59754
diff
changeset
|
3691 if (!NILP (tem)) |
eca75f16d020
(describe_map_tree): New arg MENTION_SHADOW. Calls changed.
Richard M. Stallman <rms@gnu.org>
parents:
59754
diff
changeset
|
3692 { |
eca75f16d020
(describe_map_tree): New arg MENTION_SHADOW. Calls changed.
Richard M. Stallman <rms@gnu.org>
parents:
59754
diff
changeset
|
3693 if (mention_shadow) |
eca75f16d020
(describe_map_tree): New arg MENTION_SHADOW. Calls changed.
Richard M. Stallman <rms@gnu.org>
parents:
59754
diff
changeset
|
3694 this_shadowed = 1; |
eca75f16d020
(describe_map_tree): New arg MENTION_SHADOW. Calls changed.
Richard M. Stallman <rms@gnu.org>
parents:
59754
diff
changeset
|
3695 else |
eca75f16d020
(describe_map_tree): New arg MENTION_SHADOW. Calls changed.
Richard M. Stallman <rms@gnu.org>
parents:
59754
diff
changeset
|
3696 continue; |
eca75f16d020
(describe_map_tree): New arg MENTION_SHADOW. Calls changed.
Richard M. Stallman <rms@gnu.org>
parents:
59754
diff
changeset
|
3697 } |
250 | 3698 } |
3699 | |
11973
4e0f3e3b4cc7
(describe_vector): New arg entire_map.
Karl Heuer <kwzh@gnu.org>
parents:
11924
diff
changeset
|
3700 /* Ignore this definition if it is shadowed by an earlier |
4e0f3e3b4cc7
(describe_vector): New arg entire_map.
Karl Heuer <kwzh@gnu.org>
parents:
11924
diff
changeset
|
3701 one in the same keymap. */ |
88380 | 3702 if (!NILP (entire_map)) |
11973
4e0f3e3b4cc7
(describe_vector): New arg entire_map.
Karl Heuer <kwzh@gnu.org>
parents:
11924
diff
changeset
|
3703 { |
4e0f3e3b4cc7
(describe_vector): New arg entire_map.
Karl Heuer <kwzh@gnu.org>
parents:
11924
diff
changeset
|
3704 Lisp_Object tem; |
4e0f3e3b4cc7
(describe_vector): New arg entire_map.
Karl Heuer <kwzh@gnu.org>
parents:
11924
diff
changeset
|
3705 |
4e0f3e3b4cc7
(describe_vector): New arg entire_map.
Karl Heuer <kwzh@gnu.org>
parents:
11924
diff
changeset
|
3706 tem = Flookup_key (entire_map, kludge, Qt); |
4e0f3e3b4cc7
(describe_vector): New arg entire_map.
Karl Heuer <kwzh@gnu.org>
parents:
11924
diff
changeset
|
3707 |
39689
0572449a62be
(Fkeymap_prompt, Fcurrent_active_maps): New funs.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
39682
diff
changeset
|
3708 if (!EQ (tem, definition)) |
11973
4e0f3e3b4cc7
(describe_vector): New arg entire_map.
Karl Heuer <kwzh@gnu.org>
parents:
11924
diff
changeset
|
3709 continue; |
4e0f3e3b4cc7
(describe_vector): New arg entire_map.
Karl Heuer <kwzh@gnu.org>
parents:
11924
diff
changeset
|
3710 } |
4e0f3e3b4cc7
(describe_vector): New arg entire_map.
Karl Heuer <kwzh@gnu.org>
parents:
11924
diff
changeset
|
3711 |
250 | 3712 if (first) |
3713 { | |
88747
f35665df510f
(describe_vector): Handle a char-table directly here.
Kenichi Handa <handa@m17n.org>
parents:
88380
diff
changeset
|
3714 insert ("\n", 1); |
250 | 3715 first = 0; |
3716 } | |
3717 | |
17788
208d71ea3a4f
(get_keyelt): Handle an indirect entry with meta char.
Richard M. Stallman <rms@gnu.org>
parents:
17511
diff
changeset
|
3718 /* Output the prefix that applies to every entry in this map. */ |
208d71ea3a4f
(get_keyelt): Handle an indirect entry with meta char.
Richard M. Stallman <rms@gnu.org>
parents:
17511
diff
changeset
|
3719 if (!NILP (elt_prefix)) |
208d71ea3a4f
(get_keyelt): Handle an indirect entry with meta char.
Richard M. Stallman <rms@gnu.org>
parents:
17511
diff
changeset
|
3720 insert1 (elt_prefix); |
208d71ea3a4f
(get_keyelt): Handle an indirect entry with meta char.
Richard M. Stallman <rms@gnu.org>
parents:
17511
diff
changeset
|
3721 |
89943
4c90ffeb71c5
Revision: miles@gnu.org--gnu-2004/emacs--unicode--0--patch-15
Miles Bader <miles@gnu.org>
diff
changeset
|
3722 insert1 (Fkey_description (kludge, prefix)); |
17788
208d71ea3a4f
(get_keyelt): Handle an indirect entry with meta char.
Richard M. Stallman <rms@gnu.org>
parents:
17511
diff
changeset
|
3723 |
17795
41b7d56b62fb
(describe_vector): Identify charset row numbers clearly.
Richard M. Stallman <rms@gnu.org>
parents:
17788
diff
changeset
|
3724 /* Find all consecutive characters or rows that have the same |
99981
ec7ddeda2233
(describe_vector): Adjusted for the change of
Kenichi Handa <handa@m17n.org>
parents:
96747
diff
changeset
|
3725 definition. But, VECTOR is a char-table, we had better put a |
ec7ddeda2233
(describe_vector): Adjusted for the change of
Kenichi Handa <handa@m17n.org>
parents:
96747
diff
changeset
|
3726 boundary between normal characters (-#x3FFF7F) and 8-bit |
ec7ddeda2233
(describe_vector): Adjusted for the change of
Kenichi Handa <handa@m17n.org>
parents:
96747
diff
changeset
|
3727 characters (#x3FFF80-). */ |
17327
0cb065f8702e
(describe_vector): Adjusted for the new structure of Lisp_Char_Table.
Kenichi Handa <handa@m17n.org>
parents:
17264
diff
changeset
|
3728 if (CHAR_TABLE_P (vector)) |
99981
ec7ddeda2233
(describe_vector): Adjusted for the change of
Kenichi Handa <handa@m17n.org>
parents:
96747
diff
changeset
|
3729 { |
ec7ddeda2233
(describe_vector): Adjusted for the change of
Kenichi Handa <handa@m17n.org>
parents:
96747
diff
changeset
|
3730 while (i + 1 < stop |
ec7ddeda2233
(describe_vector): Adjusted for the change of
Kenichi Handa <handa@m17n.org>
parents:
96747
diff
changeset
|
3731 && (range_beg = i + 1, range_end = stop - 1, |
ec7ddeda2233
(describe_vector): Adjusted for the change of
Kenichi Handa <handa@m17n.org>
parents:
96747
diff
changeset
|
3732 val = char_table_ref_and_range (vector, range_beg, |
88747
f35665df510f
(describe_vector): Handle a char-table directly here.
Kenichi Handa <handa@m17n.org>
parents:
88380
diff
changeset
|
3733 &range_beg, &range_end), |
f35665df510f
(describe_vector): Handle a char-table directly here.
Kenichi Handa <handa@m17n.org>
parents:
88380
diff
changeset
|
3734 tem2 = get_keyelt (val, 0), |
f35665df510f
(describe_vector): Handle a char-table directly here.
Kenichi Handa <handa@m17n.org>
parents:
88380
diff
changeset
|
3735 !NILP (tem2)) |
99981
ec7ddeda2233
(describe_vector): Adjusted for the change of
Kenichi Handa <handa@m17n.org>
parents:
96747
diff
changeset
|
3736 && !NILP (Fequal (tem2, definition))) |
ec7ddeda2233
(describe_vector): Adjusted for the change of
Kenichi Handa <handa@m17n.org>
parents:
96747
diff
changeset
|
3737 i = range_end; |
ec7ddeda2233
(describe_vector): Adjusted for the change of
Kenichi Handa <handa@m17n.org>
parents:
96747
diff
changeset
|
3738 } |
17327
0cb065f8702e
(describe_vector): Adjusted for the new structure of Lisp_Char_Table.
Kenichi Handa <handa@m17n.org>
parents:
17264
diff
changeset
|
3739 else |
99981
ec7ddeda2233
(describe_vector): Adjusted for the change of
Kenichi Handa <handa@m17n.org>
parents:
96747
diff
changeset
|
3740 while (i + 1 < stop |
32846
c1b3ab2a1ccc
Use AREF, ASET and ASIZE macros.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
32844
diff
changeset
|
3741 && (tem2 = get_keyelt (AREF (vector, i + 1), 0), |
17327
0cb065f8702e
(describe_vector): Adjusted for the new structure of Lisp_Char_Table.
Kenichi Handa <handa@m17n.org>
parents:
17264
diff
changeset
|
3742 !NILP (tem2)) |
0cb065f8702e
(describe_vector): Adjusted for the new structure of Lisp_Char_Table.
Kenichi Handa <handa@m17n.org>
parents:
17264
diff
changeset
|
3743 && !NILP (Fequal (tem2, definition))) |
0cb065f8702e
(describe_vector): Adjusted for the new structure of Lisp_Char_Table.
Kenichi Handa <handa@m17n.org>
parents:
17264
diff
changeset
|
3744 i++; |
45279
220c13a65624
(keymap_parent): New fun, extracted from Fkeymap_parent.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
45235
diff
changeset
|
3745 |
250 | 3746 /* If we have a range of more than one character, |
3747 print where the range reaches to. */ | |
3748 | |
17788
208d71ea3a4f
(get_keyelt): Handle an indirect entry with meta char.
Richard M. Stallman <rms@gnu.org>
parents:
17511
diff
changeset
|
3749 if (i != starting_i) |
250 | 3750 { |
3751 insert (" .. ", 4); | |
17788
208d71ea3a4f
(get_keyelt): Handle an indirect entry with meta char.
Richard M. Stallman <rms@gnu.org>
parents:
17511
diff
changeset
|
3752 |
54925
f0a7441d22f6
(Fkey_description): Add optional PREFIX arg.
Kim F. Storm <storm@cua.dk>
parents:
53808
diff
changeset
|
3753 ASET (kludge, 0, make_number (i)); |
f0a7441d22f6
(Fkey_description): Add optional PREFIX arg.
Kim F. Storm <storm@cua.dk>
parents:
53808
diff
changeset
|
3754 |
17788
208d71ea3a4f
(get_keyelt): Handle an indirect entry with meta char.
Richard M. Stallman <rms@gnu.org>
parents:
17511
diff
changeset
|
3755 if (!NILP (elt_prefix)) |
208d71ea3a4f
(get_keyelt): Handle an indirect entry with meta char.
Richard M. Stallman <rms@gnu.org>
parents:
17511
diff
changeset
|
3756 insert1 (elt_prefix); |
208d71ea3a4f
(get_keyelt): Handle an indirect entry with meta char.
Richard M. Stallman <rms@gnu.org>
parents:
17511
diff
changeset
|
3757 |
89943
4c90ffeb71c5
Revision: miles@gnu.org--gnu-2004/emacs--unicode--0--patch-15
Miles Bader <miles@gnu.org>
diff
changeset
|
3758 insert1 (Fkey_description (kludge, prefix)); |
250 | 3759 } |
3760 | |
3761 /* Print a description of the definition of this character. | |
3762 elt_describer will take care of spacing out far enough | |
3763 for alignment purposes. */ | |
41293
3db86c7bf56f
(Fdescribe_vector): Add `describer' parameter.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
41001
diff
changeset
|
3764 (*elt_describer) (definition, args); |
60066
eca75f16d020
(describe_map_tree): New arg MENTION_SHADOW. Calls changed.
Richard M. Stallman <rms@gnu.org>
parents:
59754
diff
changeset
|
3765 |
eca75f16d020
(describe_map_tree): New arg MENTION_SHADOW. Calls changed.
Richard M. Stallman <rms@gnu.org>
parents:
59754
diff
changeset
|
3766 if (this_shadowed) |
eca75f16d020
(describe_map_tree): New arg MENTION_SHADOW. Calls changed.
Richard M. Stallman <rms@gnu.org>
parents:
59754
diff
changeset
|
3767 { |
eca75f16d020
(describe_map_tree): New arg MENTION_SHADOW. Calls changed.
Richard M. Stallman <rms@gnu.org>
parents:
59754
diff
changeset
|
3768 SET_PT (PT - 1); |
eca75f16d020
(describe_map_tree): New arg MENTION_SHADOW. Calls changed.
Richard M. Stallman <rms@gnu.org>
parents:
59754
diff
changeset
|
3769 insert_string (" (binding currently shadowed)"); |
eca75f16d020
(describe_map_tree): New arg MENTION_SHADOW. Calls changed.
Richard M. Stallman <rms@gnu.org>
parents:
59754
diff
changeset
|
3770 SET_PT (PT + 1); |
eca75f16d020
(describe_map_tree): New arg MENTION_SHADOW. Calls changed.
Richard M. Stallman <rms@gnu.org>
parents:
59754
diff
changeset
|
3771 } |
250 | 3772 } |
3773 | |
89810
743cb02a49dd
(describe_vector): Handle default value of a char table.
Kenichi Handa <handa@m17n.org>
parents:
89655
diff
changeset
|
3774 if (CHAR_TABLE_P (vector) && ! NILP (XCHAR_TABLE (vector)->defalt)) |
17036 | 3775 { |
89810
743cb02a49dd
(describe_vector): Handle default value of a char table.
Kenichi Handa <handa@m17n.org>
parents:
89655
diff
changeset
|
3776 if (!NILP (elt_prefix)) |
743cb02a49dd
(describe_vector): Handle default value of a char table.
Kenichi Handa <handa@m17n.org>
parents:
89655
diff
changeset
|
3777 insert1 (elt_prefix); |
743cb02a49dd
(describe_vector): Handle default value of a char table.
Kenichi Handa <handa@m17n.org>
parents:
89655
diff
changeset
|
3778 insert ("default", 7); |
41293
3db86c7bf56f
(Fdescribe_vector): Add `describer' parameter.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
41001
diff
changeset
|
3779 (*elt_describer) (XCHAR_TABLE (vector)->defalt, args); |
17036 | 3780 } |
3781 | |
250 | 3782 UNGCPRO; |
3783 } | |
3784 | |
465 | 3785 /* Apropos - finding all symbols whose names match a regexp. */ |
49059
435da46787dd
(apropos_predicate, apropos_accumulate): Make them static.
Richard M. Stallman <rms@gnu.org>
parents:
46470
diff
changeset
|
3786 static Lisp_Object apropos_predicate; |
435da46787dd
(apropos_predicate, apropos_accumulate): Make them static.
Richard M. Stallman <rms@gnu.org>
parents:
46470
diff
changeset
|
3787 static Lisp_Object apropos_accumulate; |
250 | 3788 |
3789 static void | |
109126
aec1143e8d85
Convert (most) functions in src to standard C.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
109100
diff
changeset
|
3790 apropos_accum (Lisp_Object symbol, Lisp_Object string) |
250 | 3791 { |
3792 register Lisp_Object tem; | |
3793 | |
3794 tem = Fstring_match (string, Fsymbol_name (symbol), Qnil); | |
485 | 3795 if (!NILP (tem) && !NILP (apropos_predicate)) |
250 | 3796 tem = call1 (apropos_predicate, symbol); |
485 | 3797 if (!NILP (tem)) |
250 | 3798 apropos_accumulate = Fcons (symbol, apropos_accumulate); |
3799 } | |
3800 | |
45619
dbd65bd8bb4f
(describe_command): Cast `current_column' return value to int.
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
45404
diff
changeset
|
3801 DEFUN ("apropos-internal", Fapropos_internal, Sapropos_internal, 1, 2, 0, |
41001
a17c8b15ef1b
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
40804
diff
changeset
|
3802 doc: /* Show all symbols whose names contain match for REGEXP. |
a17c8b15ef1b
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
40804
diff
changeset
|
3803 If optional 2nd arg PREDICATE is non-nil, (funcall PREDICATE SYMBOL) is done |
a17c8b15ef1b
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
40804
diff
changeset
|
3804 for each symbol and a symbol is mentioned only if that returns non-nil. |
a17c8b15ef1b
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
40804
diff
changeset
|
3805 Return list of symbols found. */) |
109179
8cfee7d2955f
Convert DEFUNs to standard C.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
109165
diff
changeset
|
3806 (Lisp_Object regexp, Lisp_Object predicate) |
250 | 3807 { |
49059
435da46787dd
(apropos_predicate, apropos_accumulate): Make them static.
Richard M. Stallman <rms@gnu.org>
parents:
46470
diff
changeset
|
3808 Lisp_Object tem; |
40656
cdfd4d09b79a
Update usage of CHECK_ macros (remove unused second argument).
Pavel Janík <Pavel@Janik.cz>
parents:
40625
diff
changeset
|
3809 CHECK_STRING (regexp); |
14080
439185f0ef37
(Fkeymapp, Fdefine_prefix_command, Faccessible_keymaps,
Erik Naggum <erik@naggum.no>
parents:
13947
diff
changeset
|
3810 apropos_predicate = predicate; |
250 | 3811 apropos_accumulate = Qnil; |
14080
439185f0ef37
(Fkeymapp, Fdefine_prefix_command, Faccessible_keymaps,
Erik Naggum <erik@naggum.no>
parents:
13947
diff
changeset
|
3812 map_obarray (Vobarray, apropos_accum, regexp); |
49059
435da46787dd
(apropos_predicate, apropos_accumulate): Make them static.
Richard M. Stallman <rms@gnu.org>
parents:
46470
diff
changeset
|
3813 tem = Fsort (apropos_accumulate, Qstring_lessp); |
435da46787dd
(apropos_predicate, apropos_accumulate): Make them static.
Richard M. Stallman <rms@gnu.org>
parents:
46470
diff
changeset
|
3814 apropos_accumulate = Qnil; |
435da46787dd
(apropos_predicate, apropos_accumulate): Make them static.
Richard M. Stallman <rms@gnu.org>
parents:
46470
diff
changeset
|
3815 apropos_predicate = Qnil; |
435da46787dd
(apropos_predicate, apropos_accumulate): Make them static.
Richard M. Stallman <rms@gnu.org>
parents:
46470
diff
changeset
|
3816 return tem; |
250 | 3817 } |
3818 | |
21514 | 3819 void |
109126
aec1143e8d85
Convert (most) functions in src to standard C.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
109100
diff
changeset
|
3820 syms_of_keymap (void) |
250 | 3821 { |
105877
21bdda3ded62
* xterm.c (syms_of_xterm):
Dan Nicolaescu <dann@ics.uci.edu>
parents:
105744
diff
changeset
|
3822 Qkeymap = intern_c_string ("keymap"); |
250 | 3823 staticpro (&Qkeymap); |
49059
435da46787dd
(apropos_predicate, apropos_accumulate): Make them static.
Richard M. Stallman <rms@gnu.org>
parents:
46470
diff
changeset
|
3824 staticpro (&apropos_predicate); |
435da46787dd
(apropos_predicate, apropos_accumulate): Make them static.
Richard M. Stallman <rms@gnu.org>
parents:
46470
diff
changeset
|
3825 staticpro (&apropos_accumulate); |
435da46787dd
(apropos_predicate, apropos_accumulate): Make them static.
Richard M. Stallman <rms@gnu.org>
parents:
46470
diff
changeset
|
3826 apropos_predicate = Qnil; |
435da46787dd
(apropos_predicate, apropos_accumulate): Make them static.
Richard M. Stallman <rms@gnu.org>
parents:
46470
diff
changeset
|
3827 apropos_accumulate = Qnil; |
250 | 3828 |
105877
21bdda3ded62
* xterm.c (syms_of_xterm):
Dan Nicolaescu <dann@ics.uci.edu>
parents:
105744
diff
changeset
|
3829 Qkeymap_canonicalize = intern_c_string ("keymap-canonicalize"); |
93664
c7dd307b0ec5
* subr.el (keymap-canonicalize): New function.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
93205
diff
changeset
|
3830 staticpro (&Qkeymap_canonicalize); |
c7dd307b0ec5
* subr.el (keymap-canonicalize): New function.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
93205
diff
changeset
|
3831 |
17788
208d71ea3a4f
(get_keyelt): Handle an indirect entry with meta char.
Richard M. Stallman <rms@gnu.org>
parents:
17511
diff
changeset
|
3832 /* Now we are ready to set up this property, so we can |
208d71ea3a4f
(get_keyelt): Handle an indirect entry with meta char.
Richard M. Stallman <rms@gnu.org>
parents:
17511
diff
changeset
|
3833 create char tables. */ |
208d71ea3a4f
(get_keyelt): Handle an indirect entry with meta char.
Richard M. Stallman <rms@gnu.org>
parents:
17511
diff
changeset
|
3834 Fput (Qkeymap, Qchar_table_extra_slots, make_number (0)); |
208d71ea3a4f
(get_keyelt): Handle an indirect entry with meta char.
Richard M. Stallman <rms@gnu.org>
parents:
17511
diff
changeset
|
3835 |
208d71ea3a4f
(get_keyelt): Handle an indirect entry with meta char.
Richard M. Stallman <rms@gnu.org>
parents:
17511
diff
changeset
|
3836 /* Initialize the keymaps standardly used. |
208d71ea3a4f
(get_keyelt): Handle an indirect entry with meta char.
Richard M. Stallman <rms@gnu.org>
parents:
17511
diff
changeset
|
3837 Each one is the value of a Lisp variable, and is also |
208d71ea3a4f
(get_keyelt): Handle an indirect entry with meta char.
Richard M. Stallman <rms@gnu.org>
parents:
17511
diff
changeset
|
3838 pointed to by a C variable */ |
208d71ea3a4f
(get_keyelt): Handle an indirect entry with meta char.
Richard M. Stallman <rms@gnu.org>
parents:
17511
diff
changeset
|
3839 |
208d71ea3a4f
(get_keyelt): Handle an indirect entry with meta char.
Richard M. Stallman <rms@gnu.org>
parents:
17511
diff
changeset
|
3840 global_map = Fmake_keymap (Qnil); |
105877
21bdda3ded62
* xterm.c (syms_of_xterm):
Dan Nicolaescu <dann@ics.uci.edu>
parents:
105744
diff
changeset
|
3841 Fset (intern_c_string ("global-map"), global_map); |
250 | 3842 |
16125
2e0a45264368
(syms_of_keymap): staticpro current_global_map;
Richard M. Stallman <rms@gnu.org>
parents:
15422
diff
changeset
|
3843 current_global_map = global_map; |
16227
6acf08913847
(syms_of_keymap): staticpro global_map.
Erik Naggum <erik@naggum.no>
parents:
16125
diff
changeset
|
3844 staticpro (&global_map); |
16125
2e0a45264368
(syms_of_keymap): staticpro current_global_map;
Richard M. Stallman <rms@gnu.org>
parents:
15422
diff
changeset
|
3845 staticpro (¤t_global_map); |
2e0a45264368
(syms_of_keymap): staticpro current_global_map;
Richard M. Stallman <rms@gnu.org>
parents:
15422
diff
changeset
|
3846 |
1095
6578f07e9eb8
(Fmake_sparse_keymap, Fmake_keymap): New optional arg. Callers changed.
Richard M. Stallman <rms@gnu.org>
parents:
647
diff
changeset
|
3847 meta_map = Fmake_keymap (Qnil); |
105877
21bdda3ded62
* xterm.c (syms_of_xterm):
Dan Nicolaescu <dann@ics.uci.edu>
parents:
105744
diff
changeset
|
3848 Fset (intern_c_string ("esc-map"), meta_map); |
21bdda3ded62
* xterm.c (syms_of_xterm):
Dan Nicolaescu <dann@ics.uci.edu>
parents:
105744
diff
changeset
|
3849 Ffset (intern_c_string ("ESC-prefix"), meta_map); |
250 | 3850 |
1095
6578f07e9eb8
(Fmake_sparse_keymap, Fmake_keymap): New optional arg. Callers changed.
Richard M. Stallman <rms@gnu.org>
parents:
647
diff
changeset
|
3851 control_x_map = Fmake_keymap (Qnil); |
105877
21bdda3ded62
* xterm.c (syms_of_xterm):
Dan Nicolaescu <dann@ics.uci.edu>
parents:
105744
diff
changeset
|
3852 Fset (intern_c_string ("ctl-x-map"), control_x_map); |
21bdda3ded62
* xterm.c (syms_of_xterm):
Dan Nicolaescu <dann@ics.uci.edu>
parents:
105744
diff
changeset
|
3853 Ffset (intern_c_string ("Control-X-prefix"), control_x_map); |
250 | 3854 |
42378
9f96219e833e
(Flookup_key): Add error message for trying to bind [DEL], [RET], etc.
Richard M. Stallman <rms@gnu.org>
parents:
42206
diff
changeset
|
3855 exclude_keys |
105878
0b36e1e1cf47
* keymap.c (syms_of_keymap): Construct exclude_keys in pure memory.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
105877
diff
changeset
|
3856 = pure_cons (pure_cons (make_pure_c_string ("DEL"), make_pure_c_string ("\\d")), |
0b36e1e1cf47
* keymap.c (syms_of_keymap): Construct exclude_keys in pure memory.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
105877
diff
changeset
|
3857 pure_cons (pure_cons (make_pure_c_string ("TAB"), make_pure_c_string ("\\t")), |
0b36e1e1cf47
* keymap.c (syms_of_keymap): Construct exclude_keys in pure memory.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
105877
diff
changeset
|
3858 pure_cons (pure_cons (make_pure_c_string ("RET"), make_pure_c_string ("\\r")), |
0b36e1e1cf47
* keymap.c (syms_of_keymap): Construct exclude_keys in pure memory.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
105877
diff
changeset
|
3859 pure_cons (pure_cons (make_pure_c_string ("ESC"), make_pure_c_string ("\\e")), |
0b36e1e1cf47
* keymap.c (syms_of_keymap): Construct exclude_keys in pure memory.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
105877
diff
changeset
|
3860 pure_cons (pure_cons (make_pure_c_string ("SPC"), make_pure_c_string (" ")), |
42378
9f96219e833e
(Flookup_key): Add error message for trying to bind [DEL], [RET], etc.
Richard M. Stallman <rms@gnu.org>
parents:
42206
diff
changeset
|
3861 Qnil))))); |
9f96219e833e
(Flookup_key): Add error message for trying to bind [DEL], [RET], etc.
Richard M. Stallman <rms@gnu.org>
parents:
42206
diff
changeset
|
3862 staticpro (&exclude_keys); |
9f96219e833e
(Flookup_key): Add error message for trying to bind [DEL], [RET], etc.
Richard M. Stallman <rms@gnu.org>
parents:
42206
diff
changeset
|
3863 |
12297
fe458a8ecfa2
(Vdefine_key_rebound_commands): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
12262
diff
changeset
|
3864 DEFVAR_LISP ("define-key-rebound-commands", &Vdefine_key_rebound_commands, |
41001
a17c8b15ef1b
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
40804
diff
changeset
|
3865 doc: /* List of commands given new key bindings recently. |
a17c8b15ef1b
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
40804
diff
changeset
|
3866 This is used for internal purposes during Emacs startup; |
a17c8b15ef1b
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
40804
diff
changeset
|
3867 don't alter it yourself. */); |
12297
fe458a8ecfa2
(Vdefine_key_rebound_commands): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
12262
diff
changeset
|
3868 Vdefine_key_rebound_commands = Qt; |
fe458a8ecfa2
(Vdefine_key_rebound_commands): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
12262
diff
changeset
|
3869 |
250 | 3870 DEFVAR_LISP ("minibuffer-local-map", &Vminibuffer_local_map, |
41001
a17c8b15ef1b
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
40804
diff
changeset
|
3871 doc: /* Default keymap to use when reading from the minibuffer. */); |
1095
6578f07e9eb8
(Fmake_sparse_keymap, Fmake_keymap): New optional arg. Callers changed.
Richard M. Stallman <rms@gnu.org>
parents:
647
diff
changeset
|
3872 Vminibuffer_local_map = Fmake_sparse_keymap (Qnil); |
250 | 3873 |
3874 DEFVAR_LISP ("minibuffer-local-ns-map", &Vminibuffer_local_ns_map, | |
41001
a17c8b15ef1b
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
40804
diff
changeset
|
3875 doc: /* Local keymap for the minibuffer when spaces are not allowed. */); |
1095
6578f07e9eb8
(Fmake_sparse_keymap, Fmake_keymap): New optional arg. Callers changed.
Richard M. Stallman <rms@gnu.org>
parents:
647
diff
changeset
|
3876 Vminibuffer_local_ns_map = Fmake_sparse_keymap (Qnil); |
39837
ccaa40660e40
(Fkey_description): Use empty_string.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
39702
diff
changeset
|
3877 Fset_keymap_parent (Vminibuffer_local_ns_map, Vminibuffer_local_map); |
250 | 3878 |
3879 DEFVAR_LISP ("minibuffer-local-completion-map", &Vminibuffer_local_completion_map, | |
41001
a17c8b15ef1b
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
40804
diff
changeset
|
3880 doc: /* Local keymap for minibuffer input with completion. */); |
1095
6578f07e9eb8
(Fmake_sparse_keymap, Fmake_keymap): New optional arg. Callers changed.
Richard M. Stallman <rms@gnu.org>
parents:
647
diff
changeset
|
3881 Vminibuffer_local_completion_map = Fmake_sparse_keymap (Qnil); |
39837
ccaa40660e40
(Fkey_description): Use empty_string.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
39702
diff
changeset
|
3882 Fset_keymap_parent (Vminibuffer_local_completion_map, Vminibuffer_local_map); |
250 | 3883 |
68758
13c1b7c5f555
* data.c (Findirect_function): Add NOERROR arg. All callers changed
Kim F. Storm <storm@cua.dk>
parents:
68651
diff
changeset
|
3884 DEFVAR_LISP ("minibuffer-local-filename-completion-map", |
67259
134dc8d03e55
(Vminibuffer_local_filename_completion_map)
Eli Zaretskii <eliz@gnu.org>
parents:
67070
diff
changeset
|
3885 &Vminibuffer_local_filename_completion_map, |
134dc8d03e55
(Vminibuffer_local_filename_completion_map)
Eli Zaretskii <eliz@gnu.org>
parents:
67070
diff
changeset
|
3886 doc: /* Local keymap for minibuffer input with completion for filenames. */); |
134dc8d03e55
(Vminibuffer_local_filename_completion_map)
Eli Zaretskii <eliz@gnu.org>
parents:
67070
diff
changeset
|
3887 Vminibuffer_local_filename_completion_map = Fmake_sparse_keymap (Qnil); |
68758
13c1b7c5f555
* data.c (Findirect_function): Add NOERROR arg. All callers changed
Kim F. Storm <storm@cua.dk>
parents:
68651
diff
changeset
|
3888 Fset_keymap_parent (Vminibuffer_local_filename_completion_map, |
67259
134dc8d03e55
(Vminibuffer_local_filename_completion_map)
Eli Zaretskii <eliz@gnu.org>
parents:
67070
diff
changeset
|
3889 Vminibuffer_local_completion_map); |
134dc8d03e55
(Vminibuffer_local_filename_completion_map)
Eli Zaretskii <eliz@gnu.org>
parents:
67070
diff
changeset
|
3890 |
134dc8d03e55
(Vminibuffer_local_filename_completion_map)
Eli Zaretskii <eliz@gnu.org>
parents:
67070
diff
changeset
|
3891 |
250 | 3892 DEFVAR_LISP ("minibuffer-local-must-match-map", &Vminibuffer_local_must_match_map, |
41001
a17c8b15ef1b
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
40804
diff
changeset
|
3893 doc: /* Local keymap for minibuffer input with completion, for exact match. */); |
1095
6578f07e9eb8
(Fmake_sparse_keymap, Fmake_keymap): New optional arg. Callers changed.
Richard M. Stallman <rms@gnu.org>
parents:
647
diff
changeset
|
3894 Vminibuffer_local_must_match_map = Fmake_sparse_keymap (Qnil); |
39837
ccaa40660e40
(Fkey_description): Use empty_string.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
39702
diff
changeset
|
3895 Fset_keymap_parent (Vminibuffer_local_must_match_map, |
ccaa40660e40
(Fkey_description): Use empty_string.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
39702
diff
changeset
|
3896 Vminibuffer_local_completion_map); |
250 | 3897 |
95575
d34a432d5863
* keymap.c (Vminibuffer_local_filename_must_match_map):
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
94963
diff
changeset
|
3898 DEFVAR_LISP ("minibuffer-local-filename-must-match-map", |
d34a432d5863
* keymap.c (Vminibuffer_local_filename_must_match_map):
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
94963
diff
changeset
|
3899 &Vminibuffer_local_filename_must_match_map, |
67259
134dc8d03e55
(Vminibuffer_local_filename_completion_map)
Eli Zaretskii <eliz@gnu.org>
parents:
67070
diff
changeset
|
3900 doc: /* Local keymap for minibuffer input with completion for filenames with exact match. */); |
95575
d34a432d5863
* keymap.c (Vminibuffer_local_filename_must_match_map):
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
94963
diff
changeset
|
3901 Vminibuffer_local_filename_must_match_map = Fmake_sparse_keymap (Qnil); |
d34a432d5863
* keymap.c (Vminibuffer_local_filename_must_match_map):
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
94963
diff
changeset
|
3902 Fset_keymap_parent (Vminibuffer_local_filename_must_match_map, |
67259
134dc8d03e55
(Vminibuffer_local_filename_completion_map)
Eli Zaretskii <eliz@gnu.org>
parents:
67070
diff
changeset
|
3903 Vminibuffer_local_must_match_map); |
134dc8d03e55
(Vminibuffer_local_filename_completion_map)
Eli Zaretskii <eliz@gnu.org>
parents:
67070
diff
changeset
|
3904 |
465 | 3905 DEFVAR_LISP ("minor-mode-map-alist", &Vminor_mode_map_alist, |
41001
a17c8b15ef1b
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
40804
diff
changeset
|
3906 doc: /* Alist of keymaps to use for minor modes. |
a17c8b15ef1b
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
40804
diff
changeset
|
3907 Each element looks like (VARIABLE . KEYMAP); KEYMAP is used to read |
78501 | 3908 key sequences and look up bindings if VARIABLE's value is non-nil. |
41001
a17c8b15ef1b
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
40804
diff
changeset
|
3909 If two active keymaps bind the same key, the keymap appearing earlier |
a17c8b15ef1b
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
40804
diff
changeset
|
3910 in the list takes precedence. */); |
465 | 3911 Vminor_mode_map_alist = Qnil; |
3912 | |
20517
40bfe766d355
(Vminor_mode_overriding_map_alist): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
20381
diff
changeset
|
3913 DEFVAR_LISP ("minor-mode-overriding-map-alist", &Vminor_mode_overriding_map_alist, |
41001
a17c8b15ef1b
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
40804
diff
changeset
|
3914 doc: /* Alist of keymaps to use for minor modes, in current major mode. |
46133
14893800e663
(syms_of_keymap): Fix typo.
Juanma Barranquero <lekktu@gmail.com>
parents:
45619
diff
changeset
|
3915 This variable is an alist just like `minor-mode-map-alist', and it is |
41001
a17c8b15ef1b
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
40804
diff
changeset
|
3916 used the same way (and before `minor-mode-map-alist'); however, |
a17c8b15ef1b
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
40804
diff
changeset
|
3917 it is provided for major modes to bind locally. */); |
20517
40bfe766d355
(Vminor_mode_overriding_map_alist): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
20381
diff
changeset
|
3918 Vminor_mode_overriding_map_alist = Qnil; |
40bfe766d355
(Vminor_mode_overriding_map_alist): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
20381
diff
changeset
|
3919 |
45222
c525c7445e1b
(Vemulation_mode_map_alists): New variable.
Kim F. Storm <storm@cua.dk>
parents:
43504
diff
changeset
|
3920 DEFVAR_LISP ("emulation-mode-map-alists", &Vemulation_mode_map_alists, |
c525c7445e1b
(Vemulation_mode_map_alists): New variable.
Kim F. Storm <storm@cua.dk>
parents:
43504
diff
changeset
|
3921 doc: /* List of keymap alists to use for emulations modes. |
c525c7445e1b
(Vemulation_mode_map_alists): New variable.
Kim F. Storm <storm@cua.dk>
parents:
43504
diff
changeset
|
3922 It is intended for modes or packages using multiple minor-mode keymaps. |
c525c7445e1b
(Vemulation_mode_map_alists): New variable.
Kim F. Storm <storm@cua.dk>
parents:
43504
diff
changeset
|
3923 Each element is a keymap alist just like `minor-mode-map-alist', or a |
c525c7445e1b
(Vemulation_mode_map_alists): New variable.
Kim F. Storm <storm@cua.dk>
parents:
43504
diff
changeset
|
3924 symbol with a variable binding which is a keymap alist, and it is used |
c525c7445e1b
(Vemulation_mode_map_alists): New variable.
Kim F. Storm <storm@cua.dk>
parents:
43504
diff
changeset
|
3925 the same way. The "active" keymaps in each alist are used before |
45619
dbd65bd8bb4f
(describe_command): Cast `current_column' return value to int.
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
45404
diff
changeset
|
3926 `minor-mode-map-alist' and `minor-mode-overriding-map-alist'. */); |
45222
c525c7445e1b
(Vemulation_mode_map_alists): New variable.
Kim F. Storm <storm@cua.dk>
parents:
43504
diff
changeset
|
3927 Vemulation_mode_map_alists = Qnil; |
c525c7445e1b
(Vemulation_mode_map_alists): New variable.
Kim F. Storm <storm@cua.dk>
parents:
43504
diff
changeset
|
3928 |
96747
ebf3bd5f0017
* keymap.c: Remove all NS-specific code.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
96675
diff
changeset
|
3929 DEFVAR_LISP ("where-is-preferred-modifier", &Vwhere_is_preferred_modifier, |
ebf3bd5f0017
* keymap.c: Remove all NS-specific code.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
96675
diff
changeset
|
3930 doc: /* Preferred modifier to use for `where-is'. |
ebf3bd5f0017
* keymap.c: Remove all NS-specific code.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
96675
diff
changeset
|
3931 When a single binding is requested, `where-is' will return one that |
ebf3bd5f0017
* keymap.c: Remove all NS-specific code.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
96675
diff
changeset
|
3932 uses this modifier if possible. If nil, or if no such binding exists, |
ebf3bd5f0017
* keymap.c: Remove all NS-specific code.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
96675
diff
changeset
|
3933 bindings using keys without modifiers (or only with meta) will be |
ebf3bd5f0017
* keymap.c: Remove all NS-specific code.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
96675
diff
changeset
|
3934 preferred. */); |
ebf3bd5f0017
* keymap.c: Remove all NS-specific code.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
96675
diff
changeset
|
3935 Vwhere_is_preferred_modifier = Qnil; |
ebf3bd5f0017
* keymap.c: Remove all NS-specific code.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
96675
diff
changeset
|
3936 where_is_preferred_modifier = 0; |
ebf3bd5f0017
* keymap.c: Remove all NS-specific code.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
96675
diff
changeset
|
3937 |
53808
aa6be081315b
(Vmouse_events): Rename from Vmenu_events.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
52740
diff
changeset
|
3938 staticpro (&Vmouse_events); |
105877
21bdda3ded62
* xterm.c (syms_of_xterm):
Dan Nicolaescu <dann@ics.uci.edu>
parents:
105744
diff
changeset
|
3939 Vmouse_events = pure_cons (intern_c_string ("menu-bar"), |
21bdda3ded62
* xterm.c (syms_of_xterm):
Dan Nicolaescu <dann@ics.uci.edu>
parents:
105744
diff
changeset
|
3940 pure_cons (intern_c_string ("tool-bar"), |
21bdda3ded62
* xterm.c (syms_of_xterm):
Dan Nicolaescu <dann@ics.uci.edu>
parents:
105744
diff
changeset
|
3941 pure_cons (intern_c_string ("header-line"), |
21bdda3ded62
* xterm.c (syms_of_xterm):
Dan Nicolaescu <dann@ics.uci.edu>
parents:
105744
diff
changeset
|
3942 pure_cons (intern_c_string ("mode-line"), |
21bdda3ded62
* xterm.c (syms_of_xterm):
Dan Nicolaescu <dann@ics.uci.edu>
parents:
105744
diff
changeset
|
3943 pure_cons (intern_c_string ("mouse-1"), |
21bdda3ded62
* xterm.c (syms_of_xterm):
Dan Nicolaescu <dann@ics.uci.edu>
parents:
105744
diff
changeset
|
3944 pure_cons (intern_c_string ("mouse-2"), |
21bdda3ded62
* xterm.c (syms_of_xterm):
Dan Nicolaescu <dann@ics.uci.edu>
parents:
105744
diff
changeset
|
3945 pure_cons (intern_c_string ("mouse-3"), |
21bdda3ded62
* xterm.c (syms_of_xterm):
Dan Nicolaescu <dann@ics.uci.edu>
parents:
105744
diff
changeset
|
3946 pure_cons (intern_c_string ("mouse-4"), |
21bdda3ded62
* xterm.c (syms_of_xterm):
Dan Nicolaescu <dann@ics.uci.edu>
parents:
105744
diff
changeset
|
3947 pure_cons (intern_c_string ("mouse-5"), |
21bdda3ded62
* xterm.c (syms_of_xterm):
Dan Nicolaescu <dann@ics.uci.edu>
parents:
105744
diff
changeset
|
3948 Qnil))))))))); |
21bdda3ded62
* xterm.c (syms_of_xterm):
Dan Nicolaescu <dann@ics.uci.edu>
parents:
105744
diff
changeset
|
3949 |
21bdda3ded62
* xterm.c (syms_of_xterm):
Dan Nicolaescu <dann@ics.uci.edu>
parents:
105744
diff
changeset
|
3950 |
21bdda3ded62
* xterm.c (syms_of_xterm):
Dan Nicolaescu <dann@ics.uci.edu>
parents:
105744
diff
changeset
|
3951 Qsingle_key_description = intern_c_string ("single-key-description"); |
250 | 3952 staticpro (&Qsingle_key_description); |
3953 | |
105877
21bdda3ded62
* xterm.c (syms_of_xterm):
Dan Nicolaescu <dann@ics.uci.edu>
parents:
105744
diff
changeset
|
3954 Qkey_description = intern_c_string ("key-description"); |
250 | 3955 staticpro (&Qkey_description); |
3956 | |
105877
21bdda3ded62
* xterm.c (syms_of_xterm):
Dan Nicolaescu <dann@ics.uci.edu>
parents:
105744
diff
changeset
|
3957 Qkeymapp = intern_c_string ("keymapp"); |
250 | 3958 staticpro (&Qkeymapp); |
3959 | |
105877
21bdda3ded62
* xterm.c (syms_of_xterm):
Dan Nicolaescu <dann@ics.uci.edu>
parents:
105744
diff
changeset
|
3960 Qnon_ascii = intern_c_string ("non-ascii"); |
2727
b8911c8b9700
* keymap.c (Fwhere_is_internal): If FIRSTONLY is non-nil, avoid
Jim Blandy <jimb@redhat.com>
parents:
2652
diff
changeset
|
3961 staticpro (&Qnon_ascii); |
b8911c8b9700
* keymap.c (Fwhere_is_internal): If FIRSTONLY is non-nil, avoid
Jim Blandy <jimb@redhat.com>
parents:
2652
diff
changeset
|
3962 |
105877
21bdda3ded62
* xterm.c (syms_of_xterm):
Dan Nicolaescu <dann@ics.uci.edu>
parents:
105744
diff
changeset
|
3963 Qmenu_item = intern_c_string ("menu-item"); |
21241
31bd04a792c2
(fix_submap_inheritance, get_keyelt, store_in_keymap,
Richard M. Stallman <rms@gnu.org>
parents:
20883
diff
changeset
|
3964 staticpro (&Qmenu_item); |
31bd04a792c2
(fix_submap_inheritance, get_keyelt, store_in_keymap,
Richard M. Stallman <rms@gnu.org>
parents:
20883
diff
changeset
|
3965 |
105877
21bdda3ded62
* xterm.c (syms_of_xterm):
Dan Nicolaescu <dann@ics.uci.edu>
parents:
105744
diff
changeset
|
3966 Qremap = intern_c_string ("remap"); |
43494
b5b76b498398
The following changes rework my patch of 2002-02-06 which
Kim F. Storm <storm@cua.dk>
parents:
43164
diff
changeset
|
3967 staticpro (&Qremap); |
b5b76b498398
The following changes rework my patch of 2002-02-06 which
Kim F. Storm <storm@cua.dk>
parents:
43164
diff
changeset
|
3968 |
105877
21bdda3ded62
* xterm.c (syms_of_xterm):
Dan Nicolaescu <dann@ics.uci.edu>
parents:
105744
diff
changeset
|
3969 QCadvertised_binding = intern_c_string (":advertised-binding"); |
104922
c603ee2aac17
* keymap.c (QCadvertised_binding): New constant.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
104919
diff
changeset
|
3970 staticpro (&QCadvertised_binding); |
c603ee2aac17
* keymap.c (QCadvertised_binding): New constant.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
104919
diff
changeset
|
3971 |
49757
9fe119b14379
Renamed remap-command to command-remapping. All uses changed.
Kim F. Storm <storm@cua.dk>
parents:
49720
diff
changeset
|
3972 command_remapping_vector = Fmake_vector (make_number (2), Qremap); |
9fe119b14379
Renamed remap-command to command-remapping. All uses changed.
Kim F. Storm <storm@cua.dk>
parents:
49720
diff
changeset
|
3973 staticpro (&command_remapping_vector); |
43494
b5b76b498398
The following changes rework my patch of 2002-02-06 which
Kim F. Storm <storm@cua.dk>
parents:
43164
diff
changeset
|
3974 |
32889
673e3ef1f7f6
(where_is_cache, where_is_cache_keymaps): New vars.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
32846
diff
changeset
|
3975 where_is_cache_keymaps = Qt; |
673e3ef1f7f6
(where_is_cache, where_is_cache_keymaps): New vars.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
32846
diff
changeset
|
3976 where_is_cache = Qnil; |
673e3ef1f7f6
(where_is_cache, where_is_cache_keymaps): New vars.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
32846
diff
changeset
|
3977 staticpro (&where_is_cache); |
673e3ef1f7f6
(where_is_cache, where_is_cache_keymaps): New vars.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
32846
diff
changeset
|
3978 staticpro (&where_is_cache_keymaps); |
673e3ef1f7f6
(where_is_cache, where_is_cache_keymaps): New vars.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
32846
diff
changeset
|
3979 |
250 | 3980 defsubr (&Skeymapp); |
15344
82615c826910
(Fkeymap_parent, Fset_keymap_parent): New functions.
Richard M. Stallman <rms@gnu.org>
parents:
14738
diff
changeset
|
3981 defsubr (&Skeymap_parent); |
39689
0572449a62be
(Fkeymap_prompt, Fcurrent_active_maps): New funs.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
39682
diff
changeset
|
3982 defsubr (&Skeymap_prompt); |
15344
82615c826910
(Fkeymap_parent, Fset_keymap_parent): New functions.
Richard M. Stallman <rms@gnu.org>
parents:
14738
diff
changeset
|
3983 defsubr (&Sset_keymap_parent); |
250 | 3984 defsubr (&Smake_keymap); |
3985 defsubr (&Smake_sparse_keymap); | |
93205
29c57be95740
(map_keymap_internal): New fun.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
93204
diff
changeset
|
3986 defsubr (&Smap_keymap_internal); |
50798
2d72cdb7e9f8
(map_keymap_item, map_keymap_char_table_item, map_keymap)
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
50190
diff
changeset
|
3987 defsubr (&Smap_keymap); |
250 | 3988 defsubr (&Scopy_keymap); |
49757
9fe119b14379
Renamed remap-command to command-remapping. All uses changed.
Kim F. Storm <storm@cua.dk>
parents:
49720
diff
changeset
|
3989 defsubr (&Scommand_remapping); |
250 | 3990 defsubr (&Skey_binding); |
3991 defsubr (&Slocal_key_binding); | |
3992 defsubr (&Sglobal_key_binding); | |
465 | 3993 defsubr (&Sminor_mode_key_binding); |
250 | 3994 defsubr (&Sdefine_key); |
3995 defsubr (&Slookup_key); | |
3996 defsubr (&Sdefine_prefix_command); | |
3997 defsubr (&Suse_global_map); | |
3998 defsubr (&Suse_local_map); | |
3999 defsubr (&Scurrent_local_map); | |
4000 defsubr (&Scurrent_global_map); | |
465 | 4001 defsubr (&Scurrent_minor_mode_maps); |
39689
0572449a62be
(Fkeymap_prompt, Fcurrent_active_maps): New funs.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
39682
diff
changeset
|
4002 defsubr (&Scurrent_active_maps); |
250 | 4003 defsubr (&Saccessible_keymaps); |
4004 defsubr (&Skey_description); | |
4005 defsubr (&Sdescribe_vector); | |
4006 defsubr (&Ssingle_key_description); | |
4007 defsubr (&Stext_char_description); | |
4008 defsubr (&Swhere_is_internal); | |
39689
0572449a62be
(Fkeymap_prompt, Fcurrent_active_maps): New funs.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
39682
diff
changeset
|
4009 defsubr (&Sdescribe_buffer_bindings); |
250 | 4010 defsubr (&Sapropos_internal); |
4011 } | |
4012 | |
21514 | 4013 void |
109126
aec1143e8d85
Convert (most) functions in src to standard C.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
109100
diff
changeset
|
4014 keys_of_keymap (void) |
250 | 4015 { |
4016 initial_define_key (global_map, 033, "ESC-prefix"); | |
96747
ebf3bd5f0017
* keymap.c: Remove all NS-specific code.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
96675
diff
changeset
|
4017 initial_define_key (global_map, Ctl ('X'), "Control-X-prefix"); |
250 | 4018 } |
52401 | 4019 |
4020 /* arch-tag: 6dd15c26-7cf1-41c4-b904-f42f7ddda463 | |
4021 (do not change this comment) */ |