Mercurial > emacs
annotate src/keymap.c @ 60714:438b974e257c
(ispell-lazy-highlight): New defcustom.
(ispell-highlight-face): Set default face to `isearch' when
lazy highlighting is enabled.
(ispell-highlight-spelling-error-overlay): Set `ispell-overlay'
priority to 1. Add lazy highlighting.
(ispell-highlight-spelling-error-xemacs): Remove obsolete arg
from `isearch-dehighlight'.
author | Juri Linkov <juri@jurta.org> |
---|---|
date | Fri, 18 Mar 2005 10:00:03 +0000 |
parents | eca75f16d020 |
children | d474c1024296 9684495d72bc 7e3f621f1dd4 |
rev | line source |
---|---|
250 | 1 /* Manipulation of keymaps |
59754
a9fbaec66c84
(access_keymap): YAILOM.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
59661
diff
changeset
|
2 Copyright (C) 1985, 1986, 1987, 1988, 1993, 1994, 1995, 1998, 1999, 2000, |
a9fbaec66c84
(access_keymap): YAILOM.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
59661
diff
changeset
|
3 2001, 2004, 2005 Free Software Foundation, Inc. |
250 | 4 |
5 This file is part of GNU Emacs. | |
6 | |
7 GNU Emacs is free software; you can redistribute it and/or modify | |
8 it under the terms of the GNU General Public License as published by | |
647 | 9 the Free Software Foundation; either version 2, or (at your option) |
250 | 10 any later version. |
11 | |
12 GNU Emacs is distributed in the hope that it will be useful, | |
13 but WITHOUT ANY WARRANTY; without even the implied warranty of | |
14 MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the | |
15 GNU General Public License for more details. | |
16 | |
17 You should have received a copy of the GNU General Public License | |
18 along with GNU Emacs; see the file COPYING. If not, write to | |
14186
ee40177f6c68
Update FSF's address in the preamble.
Erik Naggum <erik@naggum.no>
parents:
14129
diff
changeset
|
19 the Free Software Foundation, Inc., 59 Temple Place - Suite 330, |
ee40177f6c68
Update FSF's address in the preamble.
Erik Naggum <erik@naggum.no>
parents:
14129
diff
changeset
|
20 Boston, MA 02111-1307, USA. */ |
250 | 21 |
22 | |
4696
1fc792473491
Include <config.h> instead of "config.h".
Roland McGrath <roland@gnu.org>
parents:
4575
diff
changeset
|
23 #include <config.h> |
250 | 24 #include <stdio.h> |
25 #include "lisp.h" | |
26 #include "commands.h" | |
27 #include "buffer.h" | |
17036 | 28 #include "charset.h" |
517 | 29 #include "keyboard.h" |
2059 | 30 #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
|
31 #include "blockinput.h" |
13771
28790743a5a3
(Fkey_binding): Handle text-property keymaps.
Karl Heuer <kwzh@gnu.org>
parents:
13343
diff
changeset
|
32 #include "puresize.h" |
29282 | 33 #include "intervals.h" |
39697
0b986bb45526
Include keymap.h.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
39689
diff
changeset
|
34 #include "keymap.h" |
250 | 35 |
1209
1aa2cd425737
* keymap.c (DENSE_TABLE_SIZE): Doc fix.
Jim Blandy <jimb@redhat.com>
parents:
1160
diff
changeset
|
36 /* The number of elements in keymap vectors. */ |
250 | 37 #define DENSE_TABLE_SIZE (0200) |
38 | |
39 /* Actually allocate storage for these variables */ | |
40 | |
41 Lisp_Object current_global_map; /* Current global keymap */ | |
42 | |
43 Lisp_Object global_map; /* default global key bindings */ | |
44 | |
45 Lisp_Object meta_map; /* The keymap used for globally bound | |
46 ESC-prefixed default commands */ | |
47 | |
48 Lisp_Object control_x_map; /* The keymap used for globally bound | |
49 C-x-prefixed default commands */ | |
50 | |
51 /* was MinibufLocalMap */ | |
52 Lisp_Object Vminibuffer_local_map; | |
53 /* The keymap used by the minibuf for local | |
54 bindings when spaces are allowed in the | |
55 minibuf */ | |
56 | |
57 /* was MinibufLocalNSMap */ | |
41293
3db86c7bf56f
(Fdescribe_vector): Add `describer' parameter.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
41001
diff
changeset
|
58 Lisp_Object Vminibuffer_local_ns_map; |
250 | 59 /* The keymap used by the minibuf for local |
60 bindings when spaces are not encouraged | |
61 in the minibuf */ | |
62 | |
63 /* keymap used for minibuffers when doing completion */ | |
64 /* was MinibufLocalCompletionMap */ | |
65 Lisp_Object Vminibuffer_local_completion_map; | |
66 | |
67 /* keymap used for minibuffers when doing completion and require a match */ | |
68 /* was MinibufLocalMustMatchMap */ | |
69 Lisp_Object Vminibuffer_local_must_match_map; | |
70 | |
465 | 71 /* Alist of minor mode variables and keymaps. */ |
72 Lisp_Object Vminor_mode_map_alist; | |
73 | |
20517
40bfe766d355
(Vminor_mode_overriding_map_alist): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
20381
diff
changeset
|
74 /* 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
|
75 minor mode variables and keymaps. */ |
40bfe766d355
(Vminor_mode_overriding_map_alist): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
20381
diff
changeset
|
76 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
|
77 |
45222
c525c7445e1b
(Vemulation_mode_map_alists): New variable.
Kim F. Storm <storm@cua.dk>
parents:
43504
diff
changeset
|
78 /* List of emulation mode keymap alists. */ |
c525c7445e1b
(Vemulation_mode_map_alists): New variable.
Kim F. Storm <storm@cua.dk>
parents:
43504
diff
changeset
|
79 Lisp_Object Vemulation_mode_map_alists; |
c525c7445e1b
(Vemulation_mode_map_alists): New variable.
Kim F. Storm <storm@cua.dk>
parents:
43504
diff
changeset
|
80 |
517 | 81 /* Keymap mapping ASCII function key sequences onto their preferred forms. |
82 Initialized by the terminal-specific lisp files. See DEFVAR for more | |
83 documentation. */ | |
84 Lisp_Object Vfunction_key_map; | |
85 | |
12710
26c09987d2f3
(describe_buffer_bindings): Print bindings from
Richard M. Stallman <rms@gnu.org>
parents:
12542
diff
changeset
|
86 /* Keymap mapping ASCII function key sequences onto their preferred forms. */ |
26c09987d2f3
(describe_buffer_bindings): Print bindings from
Richard M. Stallman <rms@gnu.org>
parents:
12542
diff
changeset
|
87 Lisp_Object Vkey_translation_map; |
26c09987d2f3
(describe_buffer_bindings): Print bindings from
Richard M. Stallman <rms@gnu.org>
parents:
12542
diff
changeset
|
88 |
12297
fe458a8ecfa2
(Vdefine_key_rebound_commands): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
12262
diff
changeset
|
89 /* 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
|
90 when nil was stored here. |
fe458a8ecfa2
(Vdefine_key_rebound_commands): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
12262
diff
changeset
|
91 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
|
92 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
|
93 Lisp_Object Vdefine_key_rebound_commands; |
fe458a8ecfa2
(Vdefine_key_rebound_commands): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
12262
diff
changeset
|
94 |
43494
b5b76b498398
The following changes rework my patch of 2002-02-06 which
Kim F. Storm <storm@cua.dk>
parents:
43164
diff
changeset
|
95 Lisp_Object Qkeymapp, Qkeymap, Qnon_ascii, Qmenu_item, Qremap; |
250 | 96 |
42381
810b3bfc52cf
Fix previous change; also correct its change log:
Richard M. Stallman <rms@gnu.org>
parents:
42378
diff
changeset
|
97 /* 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
|
98 static Lisp_Object exclude_keys; |
810b3bfc52cf
Fix previous change; also correct its change log:
Richard M. Stallman <rms@gnu.org>
parents:
42378
diff
changeset
|
99 |
49757
9fe119b14379
Renamed remap-command to command-remapping. All uses changed.
Kim F. Storm <storm@cua.dk>
parents:
49720
diff
changeset
|
100 /* 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
|
101 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
|
102 |
2886 | 103 /* A char with the CHAR_META bit set in a vector or the 0200 bit set |
104 in a string key sequence is equivalent to prefixing with this | |
105 character. */ | |
250 | 106 extern Lisp_Object meta_prefix_char; |
107 | |
5613
cad51b2de6cd
(Fkey_binding): Handle Voverriding_local_map.
Richard M. Stallman <rms@gnu.org>
parents:
5551
diff
changeset
|
108 extern Lisp_Object Voverriding_local_map; |
cad51b2de6cd
(Fkey_binding): Handle Voverriding_local_map.
Richard M. Stallman <rms@gnu.org>
parents:
5551
diff
changeset
|
109 |
32889
673e3ef1f7f6
(where_is_cache, where_is_cache_keymaps): New vars.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
32846
diff
changeset
|
110 /* 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
|
111 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
|
112 /* 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
|
113 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
|
114 |
31208
442d40fce0db
(store_in_keymap, fix_submap_inheritance): New prototypes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
30780
diff
changeset
|
115 static Lisp_Object store_in_keymap P_ ((Lisp_Object, Lisp_Object, Lisp_Object)); |
442d40fce0db
(store_in_keymap, fix_submap_inheritance): New prototypes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
30780
diff
changeset
|
116 static void fix_submap_inheritance P_ ((Lisp_Object, Lisp_Object, Lisp_Object)); |
442d40fce0db
(store_in_keymap, fix_submap_inheritance): New prototypes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
30780
diff
changeset
|
117 |
442d40fce0db
(store_in_keymap, fix_submap_inheritance): New prototypes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
30780
diff
changeset
|
118 static Lisp_Object define_as_prefix P_ ((Lisp_Object, Lisp_Object)); |
41293
3db86c7bf56f
(Fdescribe_vector): Add `describer' parameter.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
41001
diff
changeset
|
119 static void describe_command P_ ((Lisp_Object, Lisp_Object)); |
3db86c7bf56f
(Fdescribe_vector): Add `describer' parameter.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
41001
diff
changeset
|
120 static void describe_translation P_ ((Lisp_Object, Lisp_Object)); |
31208
442d40fce0db
(store_in_keymap, fix_submap_inheritance): New prototypes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
30780
diff
changeset
|
121 static void describe_map P_ ((Lisp_Object, Lisp_Object, |
41293
3db86c7bf56f
(Fdescribe_vector): Add `describer' parameter.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
41001
diff
changeset
|
122 void (*) P_ ((Lisp_Object, Lisp_Object)), |
60066
eca75f16d020
(describe_map_tree): New arg MENTION_SHADOW. Calls changed.
Richard M. Stallman <rms@gnu.org>
parents:
59754
diff
changeset
|
123 int, Lisp_Object, Lisp_Object*, int, int)); |
54925
f0a7441d22f6
(Fkey_description): Add optional PREFIX arg.
Kim F. Storm <storm@cua.dk>
parents:
53808
diff
changeset
|
124 static void describe_vector P_ ((Lisp_Object, Lisp_Object, Lisp_Object, |
f0a7441d22f6
(Fkey_description): Add optional PREFIX arg.
Kim F. Storm <storm@cua.dk>
parents:
53808
diff
changeset
|
125 void (*) (Lisp_Object, Lisp_Object), int, |
60066
eca75f16d020
(describe_map_tree): New arg MENTION_SHADOW. Calls changed.
Richard M. Stallman <rms@gnu.org>
parents:
59754
diff
changeset
|
126 Lisp_Object, Lisp_Object, int *, |
eca75f16d020
(describe_map_tree): New arg MENTION_SHADOW. Calls changed.
Richard M. Stallman <rms@gnu.org>
parents:
59754
diff
changeset
|
127 int, int, int)); |
42404
ca040d0f5c67
(silly_event_symbol_error): New subrtn, from Fdefine_key.
Richard M. Stallman <rms@gnu.org>
parents:
42381
diff
changeset
|
128 static void silly_event_symbol_error P_ ((Lisp_Object)); |
250 | 129 |
465 | 130 /* Keymap object support - constructors and predicates. */ |
131 | |
1095
6578f07e9eb8
(Fmake_sparse_keymap, Fmake_keymap): New optional arg. Callers changed.
Richard M. Stallman <rms@gnu.org>
parents:
647
diff
changeset
|
132 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
|
133 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
|
134 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
|
135 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
|
136 "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
|
137 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
|
138 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
|
139 |
a17c8b15ef1b
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
40804
diff
changeset
|
140 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
|
141 in case you use it as a menu with `x-popup-menu'. */) |
a17c8b15ef1b
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
40804
diff
changeset
|
142 (string) |
1095
6578f07e9eb8
(Fmake_sparse_keymap, Fmake_keymap): New optional arg. Callers changed.
Richard M. Stallman <rms@gnu.org>
parents:
647
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'. */) |
a17c8b15ef1b
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
40804
diff
changeset
|
163 (string) |
1095
6578f07e9eb8
(Fmake_sparse_keymap, Fmake_keymap): New optional arg. Callers changed.
Richard M. Stallman <rms@gnu.org>
parents:
647
diff
changeset
|
164 Lisp_Object string; |
250 | 165 { |
1095
6578f07e9eb8
(Fmake_sparse_keymap, Fmake_keymap): New optional arg. Callers changed.
Richard M. Stallman <rms@gnu.org>
parents:
647
diff
changeset
|
166 if (!NILP (string)) |
6578f07e9eb8
(Fmake_sparse_keymap, Fmake_keymap): New optional arg. Callers changed.
Richard M. Stallman <rms@gnu.org>
parents:
647
diff
changeset
|
167 return Fcons (Qkeymap, Fcons (string, Qnil)); |
250 | 168 return Fcons (Qkeymap, Qnil); |
169 } | |
170 | |
171 /* This function is used for installing the standard key bindings | |
172 at initialization time. | |
173 | |
174 For example: | |
175 | |
1388
02226bff1476
* keymap.c (initial_define_lispy_key): New function, for defining
Jim Blandy <jimb@redhat.com>
parents:
1315
diff
changeset
|
176 initial_define_key (control_x_map, Ctl('X'), "exchange-point-and-mark"); */ |
250 | 177 |
178 void | |
179 initial_define_key (keymap, key, defname) | |
180 Lisp_Object keymap; | |
181 int key; | |
182 char *defname; | |
183 { | |
184 store_in_keymap (keymap, make_number (key), intern (defname)); | |
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 |
02226bff1476
* keymap.c (initial_define_lispy_key): New function, for defining
Jim Blandy <jimb@redhat.com>
parents:
1315
diff
changeset
|
188 initial_define_lispy_key (keymap, keyname, defname) |
02226bff1476
* keymap.c (initial_define_lispy_key): New function, for defining
Jim Blandy <jimb@redhat.com>
parents:
1315
diff
changeset
|
189 Lisp_Object keymap; |
02226bff1476
* keymap.c (initial_define_lispy_key): New function, for defining
Jim Blandy <jimb@redhat.com>
parents:
1315
diff
changeset
|
190 char *keyname; |
02226bff1476
* keymap.c (initial_define_lispy_key): New function, for defining
Jim Blandy <jimb@redhat.com>
parents:
1315
diff
changeset
|
191 char *defname; |
02226bff1476
* keymap.c (initial_define_lispy_key): New function, for defining
Jim Blandy <jimb@redhat.com>
parents:
1315
diff
changeset
|
192 { |
02226bff1476
* keymap.c (initial_define_lispy_key): New function, for defining
Jim Blandy <jimb@redhat.com>
parents:
1315
diff
changeset
|
193 store_in_keymap (keymap, intern (keyname), intern (defname)); |
02226bff1476
* keymap.c (initial_define_lispy_key): New function, for defining
Jim Blandy <jimb@redhat.com>
parents:
1315
diff
changeset
|
194 } |
02226bff1476
* keymap.c (initial_define_lispy_key): New function, for defining
Jim Blandy <jimb@redhat.com>
parents:
1315
diff
changeset
|
195 |
250 | 196 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
|
197 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
|
198 |
a17c8b15ef1b
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
40804
diff
changeset
|
199 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
|
200 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
|
201 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
|
202 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
|
203 is also allowed as an element. */) |
a17c8b15ef1b
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
40804
diff
changeset
|
204 (object) |
250 | 205 Lisp_Object object; |
206 { | |
32988
c3435dc00ed7
* lisp.h (KEYMAPP): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
32889
diff
changeset
|
207 return (KEYMAPP (object) ? Qt : Qnil); |
250 | 208 } |
209 | |
39689
0572449a62be
(Fkeymap_prompt, Fcurrent_active_maps): New funs.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
39682
diff
changeset
|
210 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
|
211 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
|
212 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
|
213 when reading a key-sequence to be looked-up in this keymap. */) |
a17c8b15ef1b
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
40804
diff
changeset
|
214 (map) |
39689
0572449a62be
(Fkeymap_prompt, Fcurrent_active_maps): New funs.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
39682
diff
changeset
|
215 Lisp_Object map; |
0572449a62be
(Fkeymap_prompt, Fcurrent_active_maps): New funs.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
39682
diff
changeset
|
216 { |
58129
6f1bde62e20e
(Fkeymap_prompt): Accept symbol keymaps.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
57478
diff
changeset
|
217 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
|
218 while (CONSP (map)) |
0572449a62be
(Fkeymap_prompt, Fcurrent_active_maps): New funs.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
39682
diff
changeset
|
219 { |
58129
6f1bde62e20e
(Fkeymap_prompt): Accept symbol keymaps.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
57478
diff
changeset
|
220 Lisp_Object tem = XCAR (map); |
39689
0572449a62be
(Fkeymap_prompt, Fcurrent_active_maps): New funs.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
39682
diff
changeset
|
221 if (STRINGP (tem)) |
0572449a62be
(Fkeymap_prompt, Fcurrent_active_maps): New funs.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
39682
diff
changeset
|
222 return tem; |
58129
6f1bde62e20e
(Fkeymap_prompt): Accept symbol keymaps.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
57478
diff
changeset
|
223 map = XCDR (map); |
39689
0572449a62be
(Fkeymap_prompt, Fcurrent_active_maps): New funs.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
39682
diff
changeset
|
224 } |
0572449a62be
(Fkeymap_prompt, Fcurrent_active_maps): New funs.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
39682
diff
changeset
|
225 return Qnil; |
0572449a62be
(Fkeymap_prompt, Fcurrent_active_maps): New funs.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
39682
diff
changeset
|
226 } |
0572449a62be
(Fkeymap_prompt, Fcurrent_active_maps): New funs.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
39682
diff
changeset
|
227 |
250 | 228 /* 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
|
229 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
|
230 |
72b7bbcaf7d8
* keymap.c (Fdefine_key, Flookup_key, describe_map): Don't assume
Jim Blandy <jimb@redhat.com>
parents:
1441
diff
changeset
|
231 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
|
232 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
|
233 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
|
234 |
32988
c3435dc00ed7
* lisp.h (KEYMAPP): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
32889
diff
changeset
|
235 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
|
236 is zero as well), return Qt. |
c3435dc00ed7
* lisp.h (KEYMAPP): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
32889
diff
changeset
|
237 |
1517
72b7bbcaf7d8
* keymap.c (Fdefine_key, Flookup_key, describe_map): Don't assume
Jim Blandy <jimb@redhat.com>
parents:
1441
diff
changeset
|
238 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
|
239 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
|
240 |
72b7bbcaf7d8
* keymap.c (Fdefine_key, Flookup_key, describe_map): Don't assume
Jim Blandy <jimb@redhat.com>
parents:
1441
diff
changeset
|
241 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
|
242 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
|
243 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
|
244 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
|
245 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
|
246 |
784ef95b020b
(get_keymap_1): Add comment that this function can GC.
Gerd Moellmann <gerd@gnu.org>
parents:
30030
diff
changeset
|
247 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
|
248 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
|
249 |
250 | 250 Lisp_Object |
32988
c3435dc00ed7
* lisp.h (KEYMAPP): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
32889
diff
changeset
|
251 get_keymap (object, error, autoload) |
250 | 252 Lisp_Object object; |
1517
72b7bbcaf7d8
* keymap.c (Fdefine_key, Flookup_key, describe_map): Don't assume
Jim Blandy <jimb@redhat.com>
parents:
1441
diff
changeset
|
253 int error, autoload; |
250 | 254 { |
1517
72b7bbcaf7d8
* keymap.c (Fdefine_key, Flookup_key, describe_map): Don't assume
Jim Blandy <jimb@redhat.com>
parents:
1441
diff
changeset
|
255 Lisp_Object tem; |
250 | 256 |
1517
72b7bbcaf7d8
* keymap.c (Fdefine_key, Flookup_key, describe_map): Don't assume
Jim Blandy <jimb@redhat.com>
parents:
1441
diff
changeset
|
257 autoload_retry: |
25128
2563b35e613f
(get_keymap_1, get_keyelt): Check the type of OBJECT
Karl Heuer <kwzh@gnu.org>
parents:
24572
diff
changeset
|
258 if (NILP (object)) |
2563b35e613f
(get_keymap_1, get_keyelt): Check the type of OBJECT
Karl Heuer <kwzh@gnu.org>
parents:
24572
diff
changeset
|
259 goto end; |
2563b35e613f
(get_keymap_1, get_keyelt): Check the type of OBJECT
Karl Heuer <kwzh@gnu.org>
parents:
24572
diff
changeset
|
260 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
|
261 return object; |
32988
c3435dc00ed7
* lisp.h (KEYMAPP): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
32889
diff
changeset
|
262 |
c3435dc00ed7
* lisp.h (KEYMAPP): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
32889
diff
changeset
|
263 tem = indirect_function (object); |
c3435dc00ed7
* lisp.h (KEYMAPP): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
32889
diff
changeset
|
264 if (CONSP (tem)) |
25128
2563b35e613f
(get_keymap_1, get_keyelt): Check the type of OBJECT
Karl Heuer <kwzh@gnu.org>
parents:
24572
diff
changeset
|
265 { |
32988
c3435dc00ed7
* lisp.h (KEYMAPP): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
32889
diff
changeset
|
266 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
|
267 return tem; |
32988
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 /* 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
|
270 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
|
271 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
|
272 && 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
|
273 { |
32988
c3435dc00ed7
* lisp.h (KEYMAPP): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
32889
diff
changeset
|
274 Lisp_Object tail; |
c3435dc00ed7
* lisp.h (KEYMAPP): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
32889
diff
changeset
|
275 |
c3435dc00ed7
* lisp.h (KEYMAPP): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
32889
diff
changeset
|
276 tail = Fnth (make_number (4), tem); |
c3435dc00ed7
* lisp.h (KEYMAPP): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
32889
diff
changeset
|
277 if (EQ (tail, Qkeymap)) |
c3435dc00ed7
* lisp.h (KEYMAPP): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
32889
diff
changeset
|
278 { |
c3435dc00ed7
* lisp.h (KEYMAPP): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
32889
diff
changeset
|
279 if (autoload) |
c3435dc00ed7
* lisp.h (KEYMAPP): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
32889
diff
changeset
|
280 { |
c3435dc00ed7
* lisp.h (KEYMAPP): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
32889
diff
changeset
|
281 struct gcpro gcpro1, gcpro2; |
45279
220c13a65624
(keymap_parent): New fun, extracted from Fkeymap_parent.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
45235
diff
changeset
|
282 |
32988
c3435dc00ed7
* lisp.h (KEYMAPP): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
32889
diff
changeset
|
283 GCPRO2 (tem, object); |
c3435dc00ed7
* lisp.h (KEYMAPP): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
32889
diff
changeset
|
284 do_autoload (tem, object); |
c3435dc00ed7
* lisp.h (KEYMAPP): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
32889
diff
changeset
|
285 UNGCPRO; |
45279
220c13a65624
(keymap_parent): New fun, extracted from Fkeymap_parent.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
45235
diff
changeset
|
286 |
32988
c3435dc00ed7
* lisp.h (KEYMAPP): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
32889
diff
changeset
|
287 goto autoload_retry; |
c3435dc00ed7
* lisp.h (KEYMAPP): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
32889
diff
changeset
|
288 } |
c3435dc00ed7
* lisp.h (KEYMAPP): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
32889
diff
changeset
|
289 else |
c3435dc00ed7
* lisp.h (KEYMAPP): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
32889
diff
changeset
|
290 return Qt; |
c3435dc00ed7
* lisp.h (KEYMAPP): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
32889
diff
changeset
|
291 } |
1566
892c9f61217a
* keymap.c (get_keymap_1): Don't try to autoload OBJECT's function
Jim Blandy <jimb@redhat.com>
parents:
1517
diff
changeset
|
292 } |
1517
72b7bbcaf7d8
* keymap.c (Fdefine_key, Flookup_key, describe_map): Don't assume
Jim Blandy <jimb@redhat.com>
parents:
1441
diff
changeset
|
293 } |
72b7bbcaf7d8
* keymap.c (Fdefine_key, Flookup_key, describe_map): Don't assume
Jim Blandy <jimb@redhat.com>
parents:
1441
diff
changeset
|
294 |
25128
2563b35e613f
(get_keymap_1, get_keyelt): Check the type of OBJECT
Karl Heuer <kwzh@gnu.org>
parents:
24572
diff
changeset
|
295 end: |
250 | 296 if (error) |
297 wrong_type_argument (Qkeymapp, object); | |
31829
43566b0aec59
Avoid some more compiler warnings.
Gerd Moellmann <gerd@gnu.org>
parents:
31496
diff
changeset
|
298 return Qnil; |
250 | 299 } |
15344
82615c826910
(Fkeymap_parent, Fset_keymap_parent): New functions.
Richard M. Stallman <rms@gnu.org>
parents:
14738
diff
changeset
|
300 |
45279
220c13a65624
(keymap_parent): New fun, extracted from Fkeymap_parent.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
45235
diff
changeset
|
301 /* 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
|
302 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
|
303 |
220c13a65624
(keymap_parent): New fun, extracted from Fkeymap_parent.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
45235
diff
changeset
|
304 Lisp_Object |
220c13a65624
(keymap_parent): New fun, extracted from Fkeymap_parent.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
45235
diff
changeset
|
305 keymap_parent (keymap, autoload) |
15344
82615c826910
(Fkeymap_parent, Fset_keymap_parent): New functions.
Richard M. Stallman <rms@gnu.org>
parents:
14738
diff
changeset
|
306 Lisp_Object keymap; |
45279
220c13a65624
(keymap_parent): New fun, extracted from Fkeymap_parent.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
45235
diff
changeset
|
307 int autoload; |
15344
82615c826910
(Fkeymap_parent, Fset_keymap_parent): New functions.
Richard M. Stallman <rms@gnu.org>
parents:
14738
diff
changeset
|
308 { |
82615c826910
(Fkeymap_parent, Fset_keymap_parent): New functions.
Richard M. Stallman <rms@gnu.org>
parents:
14738
diff
changeset
|
309 Lisp_Object list; |
82615c826910
(Fkeymap_parent, Fset_keymap_parent): New functions.
Richard M. Stallman <rms@gnu.org>
parents:
14738
diff
changeset
|
310 |
45279
220c13a65624
(keymap_parent): New fun, extracted from Fkeymap_parent.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
45235
diff
changeset
|
311 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
|
312 |
82615c826910
(Fkeymap_parent, Fset_keymap_parent): New functions.
Richard M. Stallman <rms@gnu.org>
parents:
14738
diff
changeset
|
313 /* 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
|
314 list = XCDR (keymap); |
0a7261c1d487
Use XCAR, XCDR, and XFLOAT_DATA instead of explicit member access.
Ken Raeburn <raeburn@raeburn.org>
parents:
25600
diff
changeset
|
315 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
|
316 { |
82615c826910
(Fkeymap_parent, Fset_keymap_parent): New functions.
Richard M. Stallman <rms@gnu.org>
parents:
14738
diff
changeset
|
317 /* 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
|
318 if (KEYMAPP (list)) |
15344
82615c826910
(Fkeymap_parent, Fset_keymap_parent): New functions.
Richard M. Stallman <rms@gnu.org>
parents:
14738
diff
changeset
|
319 return list; |
82615c826910
(Fkeymap_parent, Fset_keymap_parent): New functions.
Richard M. Stallman <rms@gnu.org>
parents:
14738
diff
changeset
|
320 } |
82615c826910
(Fkeymap_parent, Fset_keymap_parent): New functions.
Richard M. Stallman <rms@gnu.org>
parents:
14738
diff
changeset
|
321 |
45279
220c13a65624
(keymap_parent): New fun, extracted from Fkeymap_parent.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
45235
diff
changeset
|
322 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
|
323 } |
82615c826910
(Fkeymap_parent, Fset_keymap_parent): New functions.
Richard M. Stallman <rms@gnu.org>
parents:
14738
diff
changeset
|
324 |
45279
220c13a65624
(keymap_parent): New fun, extracted from Fkeymap_parent.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
45235
diff
changeset
|
325 DEFUN ("keymap-parent", Fkeymap_parent, Skeymap_parent, 1, 1, 0, |
220c13a65624
(keymap_parent): New fun, extracted from Fkeymap_parent.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
45235
diff
changeset
|
326 doc: /* Return the parent keymap of KEYMAP. */) |
220c13a65624
(keymap_parent): New fun, extracted from Fkeymap_parent.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
45235
diff
changeset
|
327 (keymap) |
220c13a65624
(keymap_parent): New fun, extracted from Fkeymap_parent.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
45235
diff
changeset
|
328 Lisp_Object keymap; |
220c13a65624
(keymap_parent): New fun, extracted from Fkeymap_parent.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
45235
diff
changeset
|
329 { |
220c13a65624
(keymap_parent): New fun, extracted from Fkeymap_parent.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
45235
diff
changeset
|
330 return keymap_parent (keymap, 1); |
220c13a65624
(keymap_parent): New fun, extracted from Fkeymap_parent.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
45235
diff
changeset
|
331 } |
31496
946e1ba42cc9
(Fset_keymap_parent): Check for cycles in keymap
Gerd Moellmann <gerd@gnu.org>
parents:
31232
diff
changeset
|
332 |
32038
0cb9cab990cb
(keymap_memberp): New function.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
31989
diff
changeset
|
333 /* Check whether MAP is one of MAPS parents. */ |
0cb9cab990cb
(keymap_memberp): New function.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
31989
diff
changeset
|
334 int |
0cb9cab990cb
(keymap_memberp): New function.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
31989
diff
changeset
|
335 keymap_memberp (map, maps) |
0cb9cab990cb
(keymap_memberp): New function.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
31989
diff
changeset
|
336 Lisp_Object map, maps; |
0cb9cab990cb
(keymap_memberp): New function.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
31989
diff
changeset
|
337 { |
32559
bc60bd171784
(keymap_memberp): Ensure that nil is not a member.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
32478
diff
changeset
|
338 if (NILP (map)) return 0; |
32038
0cb9cab990cb
(keymap_memberp): New function.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
31989
diff
changeset
|
339 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
|
340 maps = keymap_parent (maps, 0); |
32038
0cb9cab990cb
(keymap_memberp): New function.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
31989
diff
changeset
|
341 return (EQ (map, maps)); |
0cb9cab990cb
(keymap_memberp): New function.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
31989
diff
changeset
|
342 } |
0cb9cab990cb
(keymap_memberp): New function.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
31989
diff
changeset
|
343 |
15344
82615c826910
(Fkeymap_parent, Fset_keymap_parent): New functions.
Richard M. Stallman <rms@gnu.org>
parents:
14738
diff
changeset
|
344 /* 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
|
345 |
82615c826910
(Fkeymap_parent, Fset_keymap_parent): New functions.
Richard M. Stallman <rms@gnu.org>
parents:
14738
diff
changeset
|
346 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
|
347 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
|
348 Return PARENT. PARENT should be nil or another keymap. */) |
41001
a17c8b15ef1b
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
40804
diff
changeset
|
349 (keymap, parent) |
15344
82615c826910
(Fkeymap_parent, Fset_keymap_parent): New functions.
Richard M. Stallman <rms@gnu.org>
parents:
14738
diff
changeset
|
350 Lisp_Object keymap, parent; |
82615c826910
(Fkeymap_parent, Fset_keymap_parent): New functions.
Richard M. Stallman <rms@gnu.org>
parents:
14738
diff
changeset
|
351 { |
82615c826910
(Fkeymap_parent, Fset_keymap_parent): New functions.
Richard M. Stallman <rms@gnu.org>
parents:
14738
diff
changeset
|
352 Lisp_Object list, prev; |
45279
220c13a65624
(keymap_parent): New fun, extracted from Fkeymap_parent.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
45235
diff
changeset
|
353 struct gcpro gcpro1, gcpro2; |
15344
82615c826910
(Fkeymap_parent, Fset_keymap_parent): New functions.
Richard M. Stallman <rms@gnu.org>
parents:
14738
diff
changeset
|
354 int i; |
82615c826910
(Fkeymap_parent, Fset_keymap_parent): New functions.
Richard M. Stallman <rms@gnu.org>
parents:
14738
diff
changeset
|
355 |
32889
673e3ef1f7f6
(where_is_cache, where_is_cache_keymaps): New vars.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
32846
diff
changeset
|
356 /* 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
|
357 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
|
358 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
|
359 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
|
360 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
|
361 adverse effect. |
673e3ef1f7f6
(where_is_cache, where_is_cache_keymaps): New vars.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
32846
diff
changeset
|
362 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
|
363 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
|
364 |
45279
220c13a65624
(keymap_parent): New fun, extracted from Fkeymap_parent.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
45235
diff
changeset
|
365 GCPRO2 (keymap, parent); |
32988
c3435dc00ed7
* lisp.h (KEYMAPP): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
32889
diff
changeset
|
366 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
|
367 |
15344
82615c826910
(Fkeymap_parent, Fset_keymap_parent): New functions.
Richard M. Stallman <rms@gnu.org>
parents:
14738
diff
changeset
|
368 if (!NILP (parent)) |
31496
946e1ba42cc9
(Fset_keymap_parent): Check for cycles in keymap
Gerd Moellmann <gerd@gnu.org>
parents:
31232
diff
changeset
|
369 { |
32988
c3435dc00ed7
* lisp.h (KEYMAPP): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
32889
diff
changeset
|
370 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
|
371 |
946e1ba42cc9
(Fset_keymap_parent): Check for cycles in keymap
Gerd Moellmann <gerd@gnu.org>
parents:
31232
diff
changeset
|
372 /* Check for cycles. */ |
32038
0cb9cab990cb
(keymap_memberp): New function.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
31989
diff
changeset
|
373 if (keymap_memberp (keymap, parent)) |
31496
946e1ba42cc9
(Fset_keymap_parent): Check for cycles in keymap
Gerd Moellmann <gerd@gnu.org>
parents:
31232
diff
changeset
|
374 error ("Cyclic keymap inheritance"); |
946e1ba42cc9
(Fset_keymap_parent): Check for cycles in keymap
Gerd Moellmann <gerd@gnu.org>
parents:
31232
diff
changeset
|
375 } |
15344
82615c826910
(Fkeymap_parent, Fset_keymap_parent): New functions.
Richard M. Stallman <rms@gnu.org>
parents:
14738
diff
changeset
|
376 |
82615c826910
(Fkeymap_parent, Fset_keymap_parent): New functions.
Richard M. Stallman <rms@gnu.org>
parents:
14738
diff
changeset
|
377 /* Skip past the initial element `keymap'. */ |
82615c826910
(Fkeymap_parent, Fset_keymap_parent): New functions.
Richard M. Stallman <rms@gnu.org>
parents:
14738
diff
changeset
|
378 prev = keymap; |
82615c826910
(Fkeymap_parent, Fset_keymap_parent): New functions.
Richard M. Stallman <rms@gnu.org>
parents:
14738
diff
changeset
|
379 while (1) |
82615c826910
(Fkeymap_parent, Fset_keymap_parent): New functions.
Richard M. Stallman <rms@gnu.org>
parents:
14738
diff
changeset
|
380 { |
25662
0a7261c1d487
Use XCAR, XCDR, and XFLOAT_DATA instead of explicit member access.
Ken Raeburn <raeburn@raeburn.org>
parents:
25600
diff
changeset
|
381 list = XCDR (prev); |
15344
82615c826910
(Fkeymap_parent, Fset_keymap_parent): New functions.
Richard M. Stallman <rms@gnu.org>
parents:
14738
diff
changeset
|
382 /* 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
|
383 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
|
384 if (!CONSP (list) || KEYMAPP (list)) |
15344
82615c826910
(Fkeymap_parent, Fset_keymap_parent): New functions.
Richard M. Stallman <rms@gnu.org>
parents:
14738
diff
changeset
|
385 { |
15422
dd639432a55a
(Fset_keymap_parent): Return early if KEYMAP already has the proper parent.
Richard M. Stallman <rms@gnu.org>
parents:
15378
diff
changeset
|
386 /* 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
|
387 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
|
388 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
|
389 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
|
390 |
39973
579177964efa
Avoid (most) uses of XCAR/XCDR as lvalues, for flexibility in experimenting
Ken Raeburn <raeburn@raeburn.org>
parents:
39940
diff
changeset
|
391 XSETCDR (prev, parent); |
15344
82615c826910
(Fkeymap_parent, Fset_keymap_parent): New functions.
Richard M. Stallman <rms@gnu.org>
parents:
14738
diff
changeset
|
392 break; |
82615c826910
(Fkeymap_parent, Fset_keymap_parent): New functions.
Richard M. Stallman <rms@gnu.org>
parents:
14738
diff
changeset
|
393 } |
82615c826910
(Fkeymap_parent, Fset_keymap_parent): New functions.
Richard M. Stallman <rms@gnu.org>
parents:
14738
diff
changeset
|
394 prev = list; |
82615c826910
(Fkeymap_parent, Fset_keymap_parent): New functions.
Richard M. Stallman <rms@gnu.org>
parents:
14738
diff
changeset
|
395 } |
82615c826910
(Fkeymap_parent, Fset_keymap_parent): New functions.
Richard M. Stallman <rms@gnu.org>
parents:
14738
diff
changeset
|
396 |
82615c826910
(Fkeymap_parent, Fset_keymap_parent): New functions.
Richard M. Stallman <rms@gnu.org>
parents:
14738
diff
changeset
|
397 /* 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
|
398 |
25662
0a7261c1d487
Use XCAR, XCDR, and XFLOAT_DATA instead of explicit member access.
Ken Raeburn <raeburn@raeburn.org>
parents:
25600
diff
changeset
|
399 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
|
400 { |
82615c826910
(Fkeymap_parent, Fset_keymap_parent): New functions.
Richard M. Stallman <rms@gnu.org>
parents:
14738
diff
changeset
|
401 /* 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
|
402 if (EQ (XCAR (list), Qkeymap)) |
15344
82615c826910
(Fkeymap_parent, Fset_keymap_parent): New functions.
Richard M. Stallman <rms@gnu.org>
parents:
14738
diff
changeset
|
403 break; |
82615c826910
(Fkeymap_parent, Fset_keymap_parent): New functions.
Richard M. Stallman <rms@gnu.org>
parents:
14738
diff
changeset
|
404 |
82615c826910
(Fkeymap_parent, Fset_keymap_parent): New functions.
Richard M. Stallman <rms@gnu.org>
parents:
14738
diff
changeset
|
405 /* 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
|
406 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
|
407 && 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
|
408 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
|
409 XCDR (XCAR (list))); |
0a7261c1d487
Use XCAR, XCDR, and XFLOAT_DATA instead of explicit member access.
Ken Raeburn <raeburn@raeburn.org>
parents:
25600
diff
changeset
|
410 |
0a7261c1d487
Use XCAR, XCDR, and XFLOAT_DATA instead of explicit member access.
Ken Raeburn <raeburn@raeburn.org>
parents:
25600
diff
changeset
|
411 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
|
412 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
|
413 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
|
414 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
|
415 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
|
416 |
0a7261c1d487
Use XCAR, XCDR, and XFLOAT_DATA instead of explicit member access.
Ken Raeburn <raeburn@raeburn.org>
parents:
25600
diff
changeset
|
417 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
|
418 { |
20076
374e09781f08
(Faccessible_keymaps): Avoid alloca for fixed-size array.
Karl Heuer <kwzh@gnu.org>
parents:
20070
diff
changeset
|
419 Lisp_Object indices[3]; |
17788
208d71ea3a4f
(get_keyelt): Handle an indirect entry with meta char.
Richard M. Stallman <rms@gnu.org>
parents:
17511
diff
changeset
|
420 |
51034
a5bb1c5181ac
(Fset_keymap_parent, map_keymap, Fcopy_keymap)
Richard M. Stallman <rms@gnu.org>
parents:
50828
diff
changeset
|
421 map_char_table (fix_submap_inheritance, Qnil, |
a5bb1c5181ac
(Fset_keymap_parent, map_keymap, Fcopy_keymap)
Richard M. Stallman <rms@gnu.org>
parents:
50828
diff
changeset
|
422 XCAR (list), XCAR (list), |
17788
208d71ea3a4f
(get_keyelt): Handle an indirect entry with meta char.
Richard M. Stallman <rms@gnu.org>
parents:
17511
diff
changeset
|
423 keymap, 0, indices); |
208d71ea3a4f
(get_keyelt): Handle an indirect entry with meta char.
Richard M. Stallman <rms@gnu.org>
parents:
17511
diff
changeset
|
424 } |
15344
82615c826910
(Fkeymap_parent, Fset_keymap_parent): New functions.
Richard M. Stallman <rms@gnu.org>
parents:
14738
diff
changeset
|
425 } |
82615c826910
(Fkeymap_parent, Fset_keymap_parent): New functions.
Richard M. Stallman <rms@gnu.org>
parents:
14738
diff
changeset
|
426 |
30134
784ef95b020b
(get_keymap_1): Add comment that this function can GC.
Gerd Moellmann <gerd@gnu.org>
parents:
30030
diff
changeset
|
427 RETURN_UNGCPRO (parent); |
15344
82615c826910
(Fkeymap_parent, Fset_keymap_parent): New functions.
Richard M. Stallman <rms@gnu.org>
parents:
14738
diff
changeset
|
428 } |
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 /* 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
|
431 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
|
432 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
|
433 |
31208
442d40fce0db
(store_in_keymap, fix_submap_inheritance): New prototypes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
30780
diff
changeset
|
434 static void |
15344
82615c826910
(Fkeymap_parent, Fset_keymap_parent): New functions.
Richard M. Stallman <rms@gnu.org>
parents:
14738
diff
changeset
|
435 fix_submap_inheritance (map, event, submap) |
82615c826910
(Fkeymap_parent, Fset_keymap_parent): New functions.
Richard M. Stallman <rms@gnu.org>
parents:
14738
diff
changeset
|
436 Lisp_Object map, event, submap; |
82615c826910
(Fkeymap_parent, Fset_keymap_parent): New functions.
Richard M. Stallman <rms@gnu.org>
parents:
14738
diff
changeset
|
437 { |
82615c826910
(Fkeymap_parent, Fset_keymap_parent): New functions.
Richard M. Stallman <rms@gnu.org>
parents:
14738
diff
changeset
|
438 Lisp_Object map_parent, parent_entry; |
82615c826910
(Fkeymap_parent, Fset_keymap_parent): New functions.
Richard M. Stallman <rms@gnu.org>
parents:
14738
diff
changeset
|
439 |
82615c826910
(Fkeymap_parent, Fset_keymap_parent): New functions.
Richard M. Stallman <rms@gnu.org>
parents:
14738
diff
changeset
|
440 /* 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
|
441 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
|
442 |
32988
c3435dc00ed7
* lisp.h (KEYMAPP): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
32889
diff
changeset
|
443 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
|
444 |
82615c826910
(Fkeymap_parent, Fset_keymap_parent): New functions.
Richard M. Stallman <rms@gnu.org>
parents:
14738
diff
changeset
|
445 /* 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
|
446 if (!CONSP (submap)) |
15344
82615c826910
(Fkeymap_parent, Fset_keymap_parent): New functions.
Richard M. Stallman <rms@gnu.org>
parents:
14738
diff
changeset
|
447 return; |
82615c826910
(Fkeymap_parent, Fset_keymap_parent): New functions.
Richard M. Stallman <rms@gnu.org>
parents:
14738
diff
changeset
|
448 |
45279
220c13a65624
(keymap_parent): New fun, extracted from Fkeymap_parent.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
45235
diff
changeset
|
449 map_parent = keymap_parent (map, 0); |
32988
c3435dc00ed7
* lisp.h (KEYMAPP): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
32889
diff
changeset
|
450 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
|
451 parent_entry = |
32988
c3435dc00ed7
* lisp.h (KEYMAPP): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
32889
diff
changeset
|
452 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
|
453 else |
82615c826910
(Fkeymap_parent, Fset_keymap_parent): New functions.
Richard M. Stallman <rms@gnu.org>
parents:
14738
diff
changeset
|
454 parent_entry = Qnil; |
82615c826910
(Fkeymap_parent, Fset_keymap_parent): New functions.
Richard M. Stallman <rms@gnu.org>
parents:
14738
diff
changeset
|
455 |
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
|
456 /* 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
|
457 our own submap shadows it completely. */ |
32988
c3435dc00ed7
* lisp.h (KEYMAPP): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
32889
diff
changeset
|
458 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
|
459 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
|
460 |
15344
82615c826910
(Fkeymap_parent, Fset_keymap_parent): New functions.
Richard M. Stallman <rms@gnu.org>
parents:
14738
diff
changeset
|
461 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
|
462 { |
6cea4c28fc1c
(fix_submap_inheritance): Do nothing if the proper parent is an
Richard M. Stallman <rms@gnu.org>
parents:
25128
diff
changeset
|
463 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
|
464 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
|
465 while (1) |
6cea4c28fc1c
(fix_submap_inheritance): Do nothing if the proper parent is an
Richard M. Stallman <rms@gnu.org>
parents:
25128
diff
changeset
|
466 { |
6cea4c28fc1c
(fix_submap_inheritance): Do nothing if the proper parent is an
Richard M. Stallman <rms@gnu.org>
parents:
25128
diff
changeset
|
467 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
|
468 |
45279
220c13a65624
(keymap_parent): New fun, extracted from Fkeymap_parent.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
45235
diff
changeset
|
469 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
|
470 |
5ce157b2eaa9
(fix_submap_inheritance): Don't do anything if parent_entry
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
32615
diff
changeset
|
471 if (KEYMAPP (tem)) |
5ce157b2eaa9
(fix_submap_inheritance): Don't do anything if parent_entry
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
32615
diff
changeset
|
472 { |
5ce157b2eaa9
(fix_submap_inheritance): Don't do anything if parent_entry
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
32615
diff
changeset
|
473 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
|
474 /* 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
|
475 return; |
5ce157b2eaa9
(fix_submap_inheritance): Don't do anything if parent_entry
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
32615
diff
changeset
|
476 submap_parent = tem; |
5ce157b2eaa9
(fix_submap_inheritance): Don't do anything if parent_entry
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
32615
diff
changeset
|
477 } |
25600
6cea4c28fc1c
(fix_submap_inheritance): Do nothing if the proper parent is an
Richard M. Stallman <rms@gnu.org>
parents:
25128
diff
changeset
|
478 else |
6cea4c28fc1c
(fix_submap_inheritance): Do nothing if the proper parent is an
Richard M. Stallman <rms@gnu.org>
parents:
25128
diff
changeset
|
479 break; |
6cea4c28fc1c
(fix_submap_inheritance): Do nothing if the proper parent is an
Richard M. Stallman <rms@gnu.org>
parents:
25128
diff
changeset
|
480 } |
6cea4c28fc1c
(fix_submap_inheritance): Do nothing if the proper parent is an
Richard M. Stallman <rms@gnu.org>
parents:
25128
diff
changeset
|
481 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
|
482 } |
15344
82615c826910
(Fkeymap_parent, Fset_keymap_parent): New functions.
Richard M. Stallman <rms@gnu.org>
parents:
14738
diff
changeset
|
483 } |
82615c826910
(Fkeymap_parent, Fset_keymap_parent): New functions.
Richard M. Stallman <rms@gnu.org>
parents:
14738
diff
changeset
|
484 |
1209
1aa2cd425737
* keymap.c (DENSE_TABLE_SIZE): Doc fix.
Jim Blandy <jimb@redhat.com>
parents:
1160
diff
changeset
|
485 /* 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
|
486 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
|
487 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
|
488 |
02226bff1476
* keymap.c (initial_define_lispy_key): New function, for defining
Jim Blandy <jimb@redhat.com>
parents:
1315
diff
changeset
|
489 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
|
490 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
|
491 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
|
492 |
3735
7193a99a87c1
Make prefix keys work with keymap inheritance
Richard M. Stallman <rms@gnu.org>
parents:
3691
diff
changeset
|
493 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
|
494 |
7193a99a87c1
Make prefix keys work with keymap inheritance
Richard M. Stallman <rms@gnu.org>
parents:
3691
diff
changeset
|
495 If NOINHERIT, don't accept a subkeymap found in an inherited keymap. */ |
250 | 496 |
497 Lisp_Object | |
32476
9b2a0dc393a4
* keymap.c (access_keymap): Add AUTOLOAD parameter.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
32145
diff
changeset
|
498 access_keymap (map, idx, t_ok, noinherit, autoload) |
250 | 499 Lisp_Object map; |
500 Lisp_Object idx; | |
1388
02226bff1476
* keymap.c (initial_define_lispy_key): New function, for defining
Jim Blandy <jimb@redhat.com>
parents:
1315
diff
changeset
|
501 int t_ok; |
3735
7193a99a87c1
Make prefix keys work with keymap inheritance
Richard M. Stallman <rms@gnu.org>
parents:
3691
diff
changeset
|
502 int noinherit; |
32476
9b2a0dc393a4
* keymap.c (access_keymap): Add AUTOLOAD parameter.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
32145
diff
changeset
|
503 int autoload; |
250 | 504 { |
40791
97673fa0eaa7
(access_keymap): Don't use initializers on Lisp_Object.
Richard M. Stallman <rms@gnu.org>
parents:
40656
diff
changeset
|
505 Lisp_Object val; |
97673fa0eaa7
(access_keymap): Don't use initializers on Lisp_Object.
Richard M. Stallman <rms@gnu.org>
parents:
40656
diff
changeset
|
506 |
97673fa0eaa7
(access_keymap): Don't use initializers on Lisp_Object.
Richard M. Stallman <rms@gnu.org>
parents:
40656
diff
changeset
|
507 /* 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
|
508 val = Qunbound; |
3735
7193a99a87c1
Make prefix keys work with keymap inheritance
Richard M. Stallman <rms@gnu.org>
parents:
3691
diff
changeset
|
509 |
250 | 510 /* If idx is a list (some sort of mouse click, perhaps?), |
511 the index we want to use is the car of the list, which | |
512 ought to be a symbol. */ | |
1315
884c3d7e7172
* keymap.c (access_keymap, store_in_keymap,
Jim Blandy <jimb@redhat.com>
parents:
1264
diff
changeset
|
513 idx = EVENT_HEAD (idx); |
250 | 514 |
1209
1aa2cd425737
* keymap.c (DENSE_TABLE_SIZE): Doc fix.
Jim Blandy <jimb@redhat.com>
parents:
1160
diff
changeset
|
515 /* 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
|
516 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
|
517 if (SYMBOLP (idx)) |
1209
1aa2cd425737
* keymap.c (DENSE_TABLE_SIZE): Doc fix.
Jim Blandy <jimb@redhat.com>
parents:
1160
diff
changeset
|
518 idx = reorder_modifiers (idx); |
3515
9d0af0f2dc0d
(access_keymap, store_in_keymap): Discard meaningless
Richard M. Stallman <rms@gnu.org>
parents:
3425
diff
changeset
|
519 else if (INTEGERP (idx)) |
9d0af0f2dc0d
(access_keymap, store_in_keymap): Discard meaningless
Richard M. Stallman <rms@gnu.org>
parents:
3425
diff
changeset
|
520 /* 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
|
521 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
|
522 XSETFASTINT (idx, XINT (idx) & (CHAR_META | (CHAR_META - 1))); |
250 | 523 |
32476
9b2a0dc393a4
* keymap.c (access_keymap): Add AUTOLOAD parameter.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
32145
diff
changeset
|
524 /* Handle the special meta -> esc mapping. */ |
9b2a0dc393a4
* keymap.c (access_keymap): Add AUTOLOAD parameter.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
32145
diff
changeset
|
525 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
|
526 { |
32615
5f6178a60e6b
(access_keymap): If IDX has a meta prefix, and there's
Gerd Moellmann <gerd@gnu.org>
parents:
32559
diff
changeset
|
527 /* 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
|
528 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
|
529 struct gcpro gcpro1; |
220c13a65624
(keymap_parent): New fun, extracted from Fkeymap_parent.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
45235
diff
changeset
|
530 Lisp_Object meta_map; |
220c13a65624
(keymap_parent): New fun, extracted from Fkeymap_parent.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
45235
diff
changeset
|
531 GCPRO1 (map); |
59661
e7a8549bb201
(access_keymap): Protect from bad value of meta_prefix_char.
Richard M. Stallman <rms@gnu.org>
parents:
59522
diff
changeset
|
532 /* 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
|
533 infinite recursion. Protect against that. */ |
59754
a9fbaec66c84
(access_keymap): YAILOM.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
59661
diff
changeset
|
534 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
|
535 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
|
536 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
|
537 t_ok, noinherit, autoload), |
220c13a65624
(keymap_parent): New fun, extracted from Fkeymap_parent.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
45235
diff
changeset
|
538 0, autoload); |
220c13a65624
(keymap_parent): New fun, extracted from Fkeymap_parent.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
45235
diff
changeset
|
539 UNGCPRO; |
32988
c3435dc00ed7
* lisp.h (KEYMAPP): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
32889
diff
changeset
|
540 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
|
541 { |
32739
5ce157b2eaa9
(fix_submap_inheritance): Don't do anything if parent_entry
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
32615
diff
changeset
|
542 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
|
543 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
|
544 } |
5f6178a60e6b
(access_keymap): If IDX has a meta prefix, and there's
Gerd Moellmann <gerd@gnu.org>
parents:
32559
diff
changeset
|
545 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
|
546 /* 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
|
547 idx = Qt; |
5f6178a60e6b
(access_keymap): If IDX has a meta prefix, and there's
Gerd Moellmann <gerd@gnu.org>
parents:
32559
diff
changeset
|
548 else |
5f6178a60e6b
(access_keymap): If IDX has a meta prefix, and there's
Gerd Moellmann <gerd@gnu.org>
parents:
32559
diff
changeset
|
549 /* 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
|
550 return Qnil; |
32476
9b2a0dc393a4
* keymap.c (access_keymap): Add AUTOLOAD parameter.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
32145
diff
changeset
|
551 } |
9b2a0dc393a4
* keymap.c (access_keymap): Add AUTOLOAD parameter.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
32145
diff
changeset
|
552 |
45279
220c13a65624
(keymap_parent): New fun, extracted from Fkeymap_parent.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
45235
diff
changeset
|
553 /* 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
|
554 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
|
555 for this key sequence. */ |
250 | 556 { |
1209
1aa2cd425737
* keymap.c (DENSE_TABLE_SIZE): Doc fix.
Jim Blandy <jimb@redhat.com>
parents:
1160
diff
changeset
|
557 Lisp_Object tail; |
45279
220c13a65624
(keymap_parent): New fun, extracted from Fkeymap_parent.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
45235
diff
changeset
|
558 Lisp_Object t_binding = Qnil; |
220c13a65624
(keymap_parent): New fun, extracted from Fkeymap_parent.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
45235
diff
changeset
|
559 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
|
560 |
220c13a65624
(keymap_parent): New fun, extracted from Fkeymap_parent.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
45235
diff
changeset
|
561 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
|
562 |
a6ced7cb88d9
(access_keymap): Unify handling of `t' and generic-char.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
39837
diff
changeset
|
563 /* If `t_ok' is 2, both `t' and generic-char bindings are accepted. |
a6ced7cb88d9
(access_keymap): Unify handling of `t' and generic-char.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
39837
diff
changeset
|
564 If it is 1, only generic-char bindings are accepted. |
a6ced7cb88d9
(access_keymap): Unify handling of `t' and generic-char.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
39837
diff
changeset
|
565 Otherwise, neither are. */ |
a6ced7cb88d9
(access_keymap): Unify handling of `t' and generic-char.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
39837
diff
changeset
|
566 t_ok = t_ok ? 2 : 0; |
a6ced7cb88d9
(access_keymap): Unify handling of `t' and generic-char.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
39837
diff
changeset
|
567 |
32476
9b2a0dc393a4
* keymap.c (access_keymap): Add AUTOLOAD parameter.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
32145
diff
changeset
|
568 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
|
569 (CONSP (tail) |
32988
c3435dc00ed7
* lisp.h (KEYMAPP): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
32889
diff
changeset
|
570 || (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
|
571 tail = XCDR (tail)) |
1209
1aa2cd425737
* keymap.c (DENSE_TABLE_SIZE): Doc fix.
Jim Blandy <jimb@redhat.com>
parents:
1160
diff
changeset
|
572 { |
6502
18dfda644bc0
(access_keymap, store_in_keymap, Fcopy_keymap, Fdefine_key,
Karl Heuer <kwzh@gnu.org>
parents:
6475
diff
changeset
|
573 Lisp_Object binding; |
250 | 574 |
25662
0a7261c1d487
Use XCAR, XCDR, and XFLOAT_DATA instead of explicit member access.
Ken Raeburn <raeburn@raeburn.org>
parents:
25600
diff
changeset
|
575 binding = XCAR (tail); |
9973
1d5a908f201e
(access_keymap): Use type test macros.
Karl Heuer <kwzh@gnu.org>
parents:
9957
diff
changeset
|
576 if (SYMBOLP (binding)) |
1209
1aa2cd425737
* keymap.c (DENSE_TABLE_SIZE): Doc fix.
Jim Blandy <jimb@redhat.com>
parents:
1160
diff
changeset
|
577 { |
3735
7193a99a87c1
Make prefix keys work with keymap inheritance
Richard M. Stallman <rms@gnu.org>
parents:
3691
diff
changeset
|
578 /* If NOINHERIT, stop finding prefix definitions |
7193a99a87c1
Make prefix keys work with keymap inheritance
Richard M. Stallman <rms@gnu.org>
parents:
3691
diff
changeset
|
579 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
|
580 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
|
581 RETURN_UNGCPRO (Qnil); |
9973
1d5a908f201e
(access_keymap): Use type test macros.
Karl Heuer <kwzh@gnu.org>
parents:
9957
diff
changeset
|
582 } |
1d5a908f201e
(access_keymap): Use type test macros.
Karl Heuer <kwzh@gnu.org>
parents:
9957
diff
changeset
|
583 else if (CONSP (binding)) |
1d5a908f201e
(access_keymap): Use type test macros.
Karl Heuer <kwzh@gnu.org>
parents:
9957
diff
changeset
|
584 { |
38888
bf8f70dc79f4
(access_keymap): If a binding of the form (GENERIC-CHAR
Gerd Moellmann <gerd@gnu.org>
parents:
37938
diff
changeset
|
585 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
|
586 |
38888
bf8f70dc79f4
(access_keymap): If a binding of the form (GENERIC-CHAR
Gerd Moellmann <gerd@gnu.org>
parents:
37938
diff
changeset
|
587 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
|
588 val = XCDR (binding); |
a6ced7cb88d9
(access_keymap): Unify handling of `t' and generic-char.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
39837
diff
changeset
|
589 else if (t_ok |
a6ced7cb88d9
(access_keymap): Unify handling of `t' and generic-char.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
39837
diff
changeset
|
590 && INTEGERP (idx) |
38901
f90da7c4551c
(access_keymap): Fix last change to not consider
Gerd Moellmann <gerd@gnu.org>
parents:
38888
diff
changeset
|
591 && (XINT (idx) & CHAR_MODIFIER_MASK) == 0 |
38888
bf8f70dc79f4
(access_keymap): If a binding of the form (GENERIC-CHAR
Gerd Moellmann <gerd@gnu.org>
parents:
37938
diff
changeset
|
592 && INTEGERP (key) |
38901
f90da7c4551c
(access_keymap): Fix last change to not consider
Gerd Moellmann <gerd@gnu.org>
parents:
38888
diff
changeset
|
593 && (XINT (key) & CHAR_MODIFIER_MASK) == 0 |
38888
bf8f70dc79f4
(access_keymap): If a binding of the form (GENERIC-CHAR
Gerd Moellmann <gerd@gnu.org>
parents:
37938
diff
changeset
|
594 && !SINGLE_BYTE_CHAR_P (XINT (idx)) |
bf8f70dc79f4
(access_keymap): If a binding of the form (GENERIC-CHAR
Gerd Moellmann <gerd@gnu.org>
parents:
37938
diff
changeset
|
595 && !SINGLE_BYTE_CHAR_P (XINT (key)) |
bf8f70dc79f4
(access_keymap): If a binding of the form (GENERIC-CHAR
Gerd Moellmann <gerd@gnu.org>
parents:
37938
diff
changeset
|
596 && CHAR_VALID_P (XINT (key), 1) |
bf8f70dc79f4
(access_keymap): If a binding of the form (GENERIC-CHAR
Gerd Moellmann <gerd@gnu.org>
parents:
37938
diff
changeset
|
597 && !CHAR_VALID_P (XINT (key), 0) |
bf8f70dc79f4
(access_keymap): If a binding of the form (GENERIC-CHAR
Gerd Moellmann <gerd@gnu.org>
parents:
37938
diff
changeset
|
598 && (CHAR_CHARSET (XINT (key)) |
bf8f70dc79f4
(access_keymap): If a binding of the form (GENERIC-CHAR
Gerd Moellmann <gerd@gnu.org>
parents:
37938
diff
changeset
|
599 == CHAR_CHARSET (XINT (idx)))) |
bf8f70dc79f4
(access_keymap): If a binding of the form (GENERIC-CHAR
Gerd Moellmann <gerd@gnu.org>
parents:
37938
diff
changeset
|
600 { |
bf8f70dc79f4
(access_keymap): If a binding of the form (GENERIC-CHAR
Gerd Moellmann <gerd@gnu.org>
parents:
37938
diff
changeset
|
601 /* KEY is the generic character of the charset of IDX. |
bf8f70dc79f4
(access_keymap): If a binding of the form (GENERIC-CHAR
Gerd Moellmann <gerd@gnu.org>
parents:
37938
diff
changeset
|
602 Use KEY's binding if there isn't a binding for IDX |
bf8f70dc79f4
(access_keymap): If a binding of the form (GENERIC-CHAR
Gerd Moellmann <gerd@gnu.org>
parents:
37938
diff
changeset
|
603 itself. */ |
39940
a6ced7cb88d9
(access_keymap): Unify handling of `t' and generic-char.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
39837
diff
changeset
|
604 t_binding = XCDR (binding); |
a6ced7cb88d9
(access_keymap): Unify handling of `t' and generic-char.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
39837
diff
changeset
|
605 t_ok = 0; |
38888
bf8f70dc79f4
(access_keymap): If a binding of the form (GENERIC-CHAR
Gerd Moellmann <gerd@gnu.org>
parents:
37938
diff
changeset
|
606 } |
39940
a6ced7cb88d9
(access_keymap): Unify handling of `t' and generic-char.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
39837
diff
changeset
|
607 else if (t_ok > 1 && EQ (key, Qt)) |
a6ced7cb88d9
(access_keymap): Unify handling of `t' and generic-char.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
39837
diff
changeset
|
608 { |
a6ced7cb88d9
(access_keymap): Unify handling of `t' and generic-char.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
39837
diff
changeset
|
609 t_binding = XCDR (binding); |
a6ced7cb88d9
(access_keymap): Unify handling of `t' and generic-char.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
39837
diff
changeset
|
610 t_ok = 1; |
a6ced7cb88d9
(access_keymap): Unify handling of `t' and generic-char.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
39837
diff
changeset
|
611 } |
9973
1d5a908f201e
(access_keymap): Use type test macros.
Karl Heuer <kwzh@gnu.org>
parents:
9957
diff
changeset
|
612 } |
1d5a908f201e
(access_keymap): Use type test macros.
Karl Heuer <kwzh@gnu.org>
parents:
9957
diff
changeset
|
613 else if (VECTORP (binding)) |
1d5a908f201e
(access_keymap): Use type test macros.
Karl Heuer <kwzh@gnu.org>
parents:
9957
diff
changeset
|
614 { |
39940
a6ced7cb88d9
(access_keymap): Unify handling of `t' and generic-char.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
39837
diff
changeset
|
615 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
|
616 val = AREF (binding, XFASTINT (idx)); |
1209
1aa2cd425737
* keymap.c (DENSE_TABLE_SIZE): Doc fix.
Jim Blandy <jimb@redhat.com>
parents:
1160
diff
changeset
|
617 } |
17788
208d71ea3a4f
(get_keyelt): Handle an indirect entry with meta char.
Richard M. Stallman <rms@gnu.org>
parents:
17511
diff
changeset
|
618 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
|
619 { |
17932
78a128b99e05
(access_keymap, store_in_keymap): Don't look in a char-table
Richard M. Stallman <rms@gnu.org>
parents:
17861
diff
changeset
|
620 /* 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
|
621 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
|
622 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
|
623 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
|
624 { |
bc65be224d92
(access_keymap): Handle t bindings like nil bindings.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
41387
diff
changeset
|
625 val = Faref (binding, idx); |
bc65be224d92
(access_keymap): Handle t bindings like nil bindings.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
41387
diff
changeset
|
626 /* `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
|
627 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
|
628 unbound entry. */ |
bc65be224d92
(access_keymap): Handle t bindings like nil bindings.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
41387
diff
changeset
|
629 if (NILP (val)) |
bc65be224d92
(access_keymap): Handle t bindings like nil bindings.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
41387
diff
changeset
|
630 val = Qunbound; |
bc65be224d92
(access_keymap): Handle t bindings like nil bindings.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
41387
diff
changeset
|
631 } |
17788
208d71ea3a4f
(get_keyelt): Handle an indirect entry with meta char.
Richard M. Stallman <rms@gnu.org>
parents:
17511
diff
changeset
|
632 } |
1264
6ba9d5aaace6
* keymap.c (access_keymap): Don't forget to QUIT while scanning
Jim Blandy <jimb@redhat.com>
parents:
1236
diff
changeset
|
633 |
39940
a6ced7cb88d9
(access_keymap): Unify handling of `t' and generic-char.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
39837
diff
changeset
|
634 /* 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
|
635 if (!EQ (val, Qunbound)) |
a6ced7cb88d9
(access_keymap): Unify handling of `t' and generic-char.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
39837
diff
changeset
|
636 { |
41593
bc65be224d92
(access_keymap): Handle t bindings like nil bindings.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
41387
diff
changeset
|
637 if (EQ (val, Qt)) |
bc65be224d92
(access_keymap): Handle t bindings like nil bindings.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
41387
diff
changeset
|
638 /* 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
|
639 (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
|
640 keymaps of lower precedence). */ |
bc65be224d92
(access_keymap): Handle t bindings like nil bindings.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
41387
diff
changeset
|
641 val = Qnil; |
39940
a6ced7cb88d9
(access_keymap): Unify handling of `t' and generic-char.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
39837
diff
changeset
|
642 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
|
643 if (KEYMAPP (val)) |
a6ced7cb88d9
(access_keymap): Unify handling of `t' and generic-char.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
39837
diff
changeset
|
644 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
|
645 RETURN_UNGCPRO (val); |
39940
a6ced7cb88d9
(access_keymap): Unify handling of `t' and generic-char.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
39837
diff
changeset
|
646 } |
1264
6ba9d5aaace6
* keymap.c (access_keymap): Don't forget to QUIT while scanning
Jim Blandy <jimb@redhat.com>
parents:
1236
diff
changeset
|
647 QUIT; |
250 | 648 } |
45279
220c13a65624
(keymap_parent): New fun, extracted from Fkeymap_parent.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
45235
diff
changeset
|
649 UNGCPRO; |
32476
9b2a0dc393a4
* keymap.c (access_keymap): Add AUTOLOAD parameter.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
32145
diff
changeset
|
650 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
|
651 } |
250 | 652 } |
653 | |
50798
2d72cdb7e9f8
(map_keymap_item, map_keymap_char_table_item, map_keymap)
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
50190
diff
changeset
|
654 static void |
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, key, val, data) |
2d72cdb7e9f8
(map_keymap_item, map_keymap_char_table_item, map_keymap)
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
50190
diff
changeset
|
656 map_keymap_function_t fun; |
2d72cdb7e9f8
(map_keymap_item, map_keymap_char_table_item, map_keymap)
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
50190
diff
changeset
|
657 Lisp_Object args, key, val; |
2d72cdb7e9f8
(map_keymap_item, map_keymap_char_table_item, map_keymap)
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
50190
diff
changeset
|
658 void *data; |
2d72cdb7e9f8
(map_keymap_item, map_keymap_char_table_item, map_keymap)
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
50190
diff
changeset
|
659 { |
2d72cdb7e9f8
(map_keymap_item, map_keymap_char_table_item, map_keymap)
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
50190
diff
changeset
|
660 /* 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
|
661 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
|
662 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
|
663 val = Qnil; |
2d72cdb7e9f8
(map_keymap_item, map_keymap_char_table_item, map_keymap)
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
50190
diff
changeset
|
664 (*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
|
665 } |
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 static void |
2d72cdb7e9f8
(map_keymap_item, map_keymap_char_table_item, map_keymap)
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
50190
diff
changeset
|
668 map_keymap_char_table_item (args, key, val) |
2d72cdb7e9f8
(map_keymap_item, map_keymap_char_table_item, map_keymap)
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
50190
diff
changeset
|
669 Lisp_Object args, key, val; |
2d72cdb7e9f8
(map_keymap_item, map_keymap_char_table_item, map_keymap)
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
50190
diff
changeset
|
670 { |
2d72cdb7e9f8
(map_keymap_item, map_keymap_char_table_item, map_keymap)
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
50190
diff
changeset
|
671 if (!NILP (val)) |
2d72cdb7e9f8
(map_keymap_item, map_keymap_char_table_item, map_keymap)
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
50190
diff
changeset
|
672 { |
2d72cdb7e9f8
(map_keymap_item, map_keymap_char_table_item, map_keymap)
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
50190
diff
changeset
|
673 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
|
674 args = XCDR (args); |
2d72cdb7e9f8
(map_keymap_item, map_keymap_char_table_item, map_keymap)
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
50190
diff
changeset
|
675 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
|
676 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
|
677 } |
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 /* Call FUN for every binding in MAP. |
50828
997060f8dbbb
(map_keymap): Doc fix.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
50798
diff
changeset
|
681 FUN is called with 4 arguments: FUN (KEY, BINDING, ARGS, DATA). |
997060f8dbbb
(map_keymap): Doc fix.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
50798
diff
changeset
|
682 AUTOLOAD if non-zero means that we can autoload keymaps if necessary. */ |
50798
2d72cdb7e9f8
(map_keymap_item, map_keymap_char_table_item, map_keymap)
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
50190
diff
changeset
|
683 void |
2d72cdb7e9f8
(map_keymap_item, map_keymap_char_table_item, map_keymap)
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
50190
diff
changeset
|
684 map_keymap (map, fun, args, data, autoload) |
2d72cdb7e9f8
(map_keymap_item, map_keymap_char_table_item, map_keymap)
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
50190
diff
changeset
|
685 map_keymap_function_t fun; |
2d72cdb7e9f8
(map_keymap_item, map_keymap_char_table_item, map_keymap)
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
50190
diff
changeset
|
686 Lisp_Object map, args; |
2d72cdb7e9f8
(map_keymap_item, map_keymap_char_table_item, map_keymap)
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
50190
diff
changeset
|
687 void *data; |
2d72cdb7e9f8
(map_keymap_item, map_keymap_char_table_item, map_keymap)
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
50190
diff
changeset
|
688 int autoload; |
2d72cdb7e9f8
(map_keymap_item, map_keymap_char_table_item, map_keymap)
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
50190
diff
changeset
|
689 { |
2d72cdb7e9f8
(map_keymap_item, map_keymap_char_table_item, map_keymap)
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
50190
diff
changeset
|
690 struct gcpro gcpro1, gcpro2, gcpro3; |
2d72cdb7e9f8
(map_keymap_item, map_keymap_char_table_item, map_keymap)
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
50190
diff
changeset
|
691 Lisp_Object tail; |
2d72cdb7e9f8
(map_keymap_item, map_keymap_char_table_item, map_keymap)
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
50190
diff
changeset
|
692 |
2d72cdb7e9f8
(map_keymap_item, map_keymap_char_table_item, map_keymap)
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
50190
diff
changeset
|
693 GCPRO3 (map, args, tail); |
2d72cdb7e9f8
(map_keymap_item, map_keymap_char_table_item, map_keymap)
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
50190
diff
changeset
|
694 map = get_keymap (map, 1, autoload); |
2d72cdb7e9f8
(map_keymap_item, map_keymap_char_table_item, map_keymap)
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
50190
diff
changeset
|
695 for (tail = (CONSP (map) && EQ (Qkeymap, XCAR (map))) ? XCDR (map) : map; |
2d72cdb7e9f8
(map_keymap_item, map_keymap_char_table_item, map_keymap)
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
50190
diff
changeset
|
696 CONSP (tail) || (tail = get_keymap (tail, 0, autoload), CONSP (tail)); |
2d72cdb7e9f8
(map_keymap_item, map_keymap_char_table_item, map_keymap)
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
50190
diff
changeset
|
697 tail = XCDR (tail)) |
2d72cdb7e9f8
(map_keymap_item, map_keymap_char_table_item, map_keymap)
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
50190
diff
changeset
|
698 { |
2d72cdb7e9f8
(map_keymap_item, map_keymap_char_table_item, map_keymap)
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
50190
diff
changeset
|
699 Lisp_Object binding = XCAR (tail); |
54925
f0a7441d22f6
(Fkey_description): Add optional PREFIX arg.
Kim F. Storm <storm@cua.dk>
parents:
53808
diff
changeset
|
700 |
50798
2d72cdb7e9f8
(map_keymap_item, map_keymap_char_table_item, map_keymap)
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
50190
diff
changeset
|
701 if (CONSP (binding)) |
2d72cdb7e9f8
(map_keymap_item, map_keymap_char_table_item, map_keymap)
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
50190
diff
changeset
|
702 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
|
703 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
|
704 { |
2d72cdb7e9f8
(map_keymap_item, map_keymap_char_table_item, map_keymap)
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
50190
diff
changeset
|
705 /* 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
|
706 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
|
707 int c; |
2d72cdb7e9f8
(map_keymap_item, map_keymap_char_table_item, map_keymap)
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
50190
diff
changeset
|
708 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
|
709 { |
2d72cdb7e9f8
(map_keymap_item, map_keymap_char_table_item, map_keymap)
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
50190
diff
changeset
|
710 Lisp_Object character; |
2d72cdb7e9f8
(map_keymap_item, map_keymap_char_table_item, map_keymap)
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
50190
diff
changeset
|
711 XSETFASTINT (character, c); |
2d72cdb7e9f8
(map_keymap_item, map_keymap_char_table_item, map_keymap)
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
50190
diff
changeset
|
712 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
|
713 } |
2d72cdb7e9f8
(map_keymap_item, map_keymap_char_table_item, map_keymap)
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
50190
diff
changeset
|
714 } |
2d72cdb7e9f8
(map_keymap_item, map_keymap_char_table_item, map_keymap)
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
50190
diff
changeset
|
715 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
|
716 { |
2d72cdb7e9f8
(map_keymap_item, map_keymap_char_table_item, map_keymap)
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
50190
diff
changeset
|
717 Lisp_Object indices[3]; |
51034
a5bb1c5181ac
(Fset_keymap_parent, map_keymap, Fcopy_keymap)
Richard M. Stallman <rms@gnu.org>
parents:
50828
diff
changeset
|
718 map_char_table (map_keymap_char_table_item, Qnil, binding, binding, |
50798
2d72cdb7e9f8
(map_keymap_item, map_keymap_char_table_item, map_keymap)
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
50190
diff
changeset
|
719 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
|
720 Fcons (make_save_value (data, 0), |
2d72cdb7e9f8
(map_keymap_item, map_keymap_char_table_item, map_keymap)
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
50190
diff
changeset
|
721 args)), |
2d72cdb7e9f8
(map_keymap_item, map_keymap_char_table_item, map_keymap)
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
50190
diff
changeset
|
722 0, indices); |
2d72cdb7e9f8
(map_keymap_item, map_keymap_char_table_item, map_keymap)
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
50190
diff
changeset
|
723 } |
2d72cdb7e9f8
(map_keymap_item, map_keymap_char_table_item, map_keymap)
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
50190
diff
changeset
|
724 } |
2d72cdb7e9f8
(map_keymap_item, map_keymap_char_table_item, map_keymap)
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
50190
diff
changeset
|
725 UNGCPRO; |
2d72cdb7e9f8
(map_keymap_item, map_keymap_char_table_item, map_keymap)
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
50190
diff
changeset
|
726 } |
2d72cdb7e9f8
(map_keymap_item, map_keymap_char_table_item, map_keymap)
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
50190
diff
changeset
|
727 |
2d72cdb7e9f8
(map_keymap_item, map_keymap_char_table_item, map_keymap)
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
50190
diff
changeset
|
728 static void |
2d72cdb7e9f8
(map_keymap_item, map_keymap_char_table_item, map_keymap)
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
50190
diff
changeset
|
729 map_keymap_call (key, val, fun, dummy) |
2d72cdb7e9f8
(map_keymap_item, map_keymap_char_table_item, map_keymap)
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
50190
diff
changeset
|
730 Lisp_Object key, val, fun; |
2d72cdb7e9f8
(map_keymap_item, map_keymap_char_table_item, map_keymap)
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
50190
diff
changeset
|
731 void *dummy; |
2d72cdb7e9f8
(map_keymap_item, map_keymap_char_table_item, map_keymap)
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
50190
diff
changeset
|
732 { |
2d72cdb7e9f8
(map_keymap_item, map_keymap_char_table_item, map_keymap)
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
50190
diff
changeset
|
733 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
|
734 } |
2d72cdb7e9f8
(map_keymap_item, map_keymap_char_table_item, map_keymap)
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
50190
diff
changeset
|
735 |
58271
8b3b0ccbe80b
(Fmap_keymap): New arg SORT-FIRST. Use
Richard M. Stallman <rms@gnu.org>
parents:
58129
diff
changeset
|
736 DEFUN ("map-keymap", Fmap_keymap, Smap_keymap, 2, 3, 0, |
50798
2d72cdb7e9f8
(map_keymap_item, map_keymap_char_table_item, map_keymap)
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
50190
diff
changeset
|
737 doc: /* Call FUNCTION for every binding in KEYMAP. |
56635
a8be0bc345d2
(Fmake_keymap, Fmap_keymap, Fwhere_is_internal): Doc fixes.
Luc Teirlinck <teirllm@auburn.edu>
parents:
56618
diff
changeset
|
738 FUNCTION is called with two arguments: the event and its binding. |
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) */) |
8b3b0ccbe80b
(Fmap_keymap): New arg SORT-FIRST. Use
Richard M. Stallman <rms@gnu.org>
parents:
58129
diff
changeset
|
743 (function, keymap, sort_first) |
8b3b0ccbe80b
(Fmap_keymap): New arg SORT-FIRST. Use
Richard M. Stallman <rms@gnu.org>
parents:
58129
diff
changeset
|
744 Lisp_Object function, keymap, sort_first; |
50798
2d72cdb7e9f8
(map_keymap_item, map_keymap_char_table_item, map_keymap)
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
50190
diff
changeset
|
745 { |
2d72cdb7e9f8
(map_keymap_item, map_keymap_char_table_item, map_keymap)
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
50190
diff
changeset
|
746 if (INTEGERP (function)) |
2d72cdb7e9f8
(map_keymap_item, map_keymap_char_table_item, map_keymap)
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
50190
diff
changeset
|
747 /* We have to stop integers early since map_keymap gives them special |
2d72cdb7e9f8
(map_keymap_item, map_keymap_char_table_item, map_keymap)
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
50190
diff
changeset
|
748 significance. */ |
2d72cdb7e9f8
(map_keymap_item, map_keymap_char_table_item, map_keymap)
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
50190
diff
changeset
|
749 Fsignal (Qinvalid_function, Fcons (function, Qnil)); |
58271
8b3b0ccbe80b
(Fmap_keymap): New arg SORT-FIRST. Use
Richard M. Stallman <rms@gnu.org>
parents:
58129
diff
changeset
|
750 if (! NILP (sort_first)) |
8b3b0ccbe80b
(Fmap_keymap): New arg SORT-FIRST. Use
Richard M. Stallman <rms@gnu.org>
parents:
58129
diff
changeset
|
751 return call3 (intern ("map-keymap-internal"), function, keymap, Qt); |
8b3b0ccbe80b
(Fmap_keymap): New arg SORT-FIRST. Use
Richard M. Stallman <rms@gnu.org>
parents:
58129
diff
changeset
|
752 |
50798
2d72cdb7e9f8
(map_keymap_item, map_keymap_char_table_item, map_keymap)
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
50190
diff
changeset
|
753 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
|
754 return Qnil; |
2d72cdb7e9f8
(map_keymap_item, map_keymap_char_table_item, map_keymap)
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
50190
diff
changeset
|
755 } |
2d72cdb7e9f8
(map_keymap_item, map_keymap_char_table_item, map_keymap)
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
50190
diff
changeset
|
756 |
250 | 757 /* Given OBJECT which was found in a slot in a keymap, |
758 trace indirect definitions to get the actual definition of that slot. | |
759 An indirect definition is a list of the form | |
760 (KEYMAP . INDEX), where KEYMAP is a keymap or a symbol defined as one | |
761 and INDEX is the object to look up in KEYMAP to yield the definition. | |
762 | |
763 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
|
764 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
|
765 |
a29237d1fdca
(get_keymap): Pass 1 as ERROR to get_keymap_1.
Richard M. Stallman <rms@gnu.org>
parents:
6695
diff
changeset
|
766 If AUTOLOAD is nonzero, load autoloadable keymaps |
a29237d1fdca
(get_keymap): Pass 1 as ERROR to get_keymap_1.
Richard M. Stallman <rms@gnu.org>
parents:
6695
diff
changeset
|
767 that are referred to with indirection. */ |
250 | 768 |
769 Lisp_Object | |
6774
a29237d1fdca
(get_keymap): Pass 1 as ERROR to get_keymap_1.
Richard M. Stallman <rms@gnu.org>
parents:
6695
diff
changeset
|
770 get_keyelt (object, autoload) |
45279
220c13a65624
(keymap_parent): New fun, extracted from Fkeymap_parent.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
45235
diff
changeset
|
771 Lisp_Object object; |
6774
a29237d1fdca
(get_keymap): Pass 1 as ERROR to get_keymap_1.
Richard M. Stallman <rms@gnu.org>
parents:
6695
diff
changeset
|
772 int autoload; |
250 | 773 { |
774 while (1) | |
775 { | |
25128
2563b35e613f
(get_keymap_1, get_keyelt): Check the type of OBJECT
Karl Heuer <kwzh@gnu.org>
parents:
24572
diff
changeset
|
776 if (!(CONSP (object))) |
21241
31bd04a792c2
(fix_submap_inheritance, get_keyelt, store_in_keymap,
Richard M. Stallman <rms@gnu.org>
parents:
20883
diff
changeset
|
777 /* This is really the value. */ |
31bd04a792c2
(fix_submap_inheritance, get_keyelt, store_in_keymap,
Richard M. Stallman <rms@gnu.org>
parents:
20883
diff
changeset
|
778 return object; |
31bd04a792c2
(fix_submap_inheritance, get_keyelt, store_in_keymap,
Richard M. Stallman <rms@gnu.org>
parents:
20883
diff
changeset
|
779 |
25128
2563b35e613f
(get_keymap_1, get_keyelt): Check the type of OBJECT
Karl Heuer <kwzh@gnu.org>
parents:
24572
diff
changeset
|
780 /* 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
|
781 then use itself. */ |
2563b35e613f
(get_keymap_1, get_keyelt): Check the type of OBJECT
Karl Heuer <kwzh@gnu.org>
parents:
24572
diff
changeset
|
782 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
|
783 return object; |
250 | 784 |
21241
31bd04a792c2
(fix_submap_inheritance, get_keyelt, store_in_keymap,
Richard M. Stallman <rms@gnu.org>
parents:
20883
diff
changeset
|
785 /* 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
|
786 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
|
787 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
|
788 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
|
789 { |
2563b35e613f
(get_keymap_1, get_keyelt): Check the type of OBJECT
Karl Heuer <kwzh@gnu.org>
parents:
24572
diff
changeset
|
790 if (CONSP (XCDR (object))) |
2563b35e613f
(get_keymap_1, get_keyelt): Check the type of OBJECT
Karl Heuer <kwzh@gnu.org>
parents:
24572
diff
changeset
|
791 { |
29941
0c77254c90b8
(get_keyelt): For menu-items containing a `:filter
Gerd Moellmann <gerd@gnu.org>
parents:
29726
diff
changeset
|
792 Lisp_Object tem; |
0c77254c90b8
(get_keyelt): For menu-items containing a `:filter
Gerd Moellmann <gerd@gnu.org>
parents:
29726
diff
changeset
|
793 |
25128
2563b35e613f
(get_keymap_1, get_keyelt): Check the type of OBJECT
Karl Heuer <kwzh@gnu.org>
parents:
24572
diff
changeset
|
794 object = XCDR (XCDR (object)); |
29941
0c77254c90b8
(get_keyelt): For menu-items containing a `:filter
Gerd Moellmann <gerd@gnu.org>
parents:
29726
diff
changeset
|
795 tem = object; |
25128
2563b35e613f
(get_keymap_1, get_keyelt): Check the type of OBJECT
Karl Heuer <kwzh@gnu.org>
parents:
24572
diff
changeset
|
796 if (CONSP (object)) |
2563b35e613f
(get_keymap_1, get_keyelt): Check the type of OBJECT
Karl Heuer <kwzh@gnu.org>
parents:
24572
diff
changeset
|
797 object = XCAR (object); |
29941
0c77254c90b8
(get_keyelt): For menu-items containing a `:filter
Gerd Moellmann <gerd@gnu.org>
parents:
29726
diff
changeset
|
798 |
0c77254c90b8
(get_keyelt): For menu-items containing a `:filter
Gerd Moellmann <gerd@gnu.org>
parents:
29726
diff
changeset
|
799 /* 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
|
800 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
|
801 use. */ |
29941
0c77254c90b8
(get_keyelt): For menu-items containing a `:filter
Gerd Moellmann <gerd@gnu.org>
parents:
29726
diff
changeset
|
802 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
|
803 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
|
804 { |
0c77254c90b8
(get_keyelt): For menu-items containing a `:filter
Gerd Moellmann <gerd@gnu.org>
parents:
29726
diff
changeset
|
805 Lisp_Object filter; |
0c77254c90b8
(get_keyelt): For menu-items containing a `:filter
Gerd Moellmann <gerd@gnu.org>
parents:
29726
diff
changeset
|
806 filter = XCAR (XCDR (tem)); |
0c77254c90b8
(get_keyelt): For menu-items containing a `:filter
Gerd Moellmann <gerd@gnu.org>
parents:
29726
diff
changeset
|
807 filter = list2 (filter, list2 (Qquote, object)); |
0c77254c90b8
(get_keyelt): For menu-items containing a `:filter
Gerd Moellmann <gerd@gnu.org>
parents:
29726
diff
changeset
|
808 object = menu_item_eval_property (filter); |
0c77254c90b8
(get_keyelt): For menu-items containing a `:filter
Gerd Moellmann <gerd@gnu.org>
parents:
29726
diff
changeset
|
809 break; |
0c77254c90b8
(get_keyelt): For menu-items containing a `:filter
Gerd Moellmann <gerd@gnu.org>
parents:
29726
diff
changeset
|
810 } |
25128
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 else |
45279
220c13a65624
(keymap_parent): New fun, extracted from Fkeymap_parent.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
45235
diff
changeset
|
813 /* Invalid keymap. */ |
25128
2563b35e613f
(get_keymap_1, get_keyelt): Check the type of OBJECT
Karl Heuer <kwzh@gnu.org>
parents:
24572
diff
changeset
|
814 return object; |
2563b35e613f
(get_keymap_1, get_keyelt): Check the type of OBJECT
Karl Heuer <kwzh@gnu.org>
parents:
24572
diff
changeset
|
815 } |
2563b35e613f
(get_keymap_1, get_keyelt): Check the type of OBJECT
Karl Heuer <kwzh@gnu.org>
parents:
24572
diff
changeset
|
816 |
2563b35e613f
(get_keymap_1, get_keyelt): Check the type of OBJECT
Karl Heuer <kwzh@gnu.org>
parents:
24572
diff
changeset
|
817 /* 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
|
818 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
|
819 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
|
820 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
|
821 { |
25128
2563b35e613f
(get_keymap_1, get_keyelt): Check the type of OBJECT
Karl Heuer <kwzh@gnu.org>
parents:
24572
diff
changeset
|
822 object = XCDR (object); |
2563b35e613f
(get_keymap_1, get_keyelt): Check the type of OBJECT
Karl Heuer <kwzh@gnu.org>
parents:
24572
diff
changeset
|
823 /* 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
|
824 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
|
825 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
|
826 object = XCDR (object); |
2563b35e613f
(get_keymap_1, get_keyelt): Check the type of OBJECT
Karl Heuer <kwzh@gnu.org>
parents:
24572
diff
changeset
|
827 /* 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
|
828 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
|
829 { |
2563b35e613f
(get_keymap_1, get_keyelt): Check the type of OBJECT
Karl Heuer <kwzh@gnu.org>
parents:
24572
diff
changeset
|
830 Lisp_Object carcar; |
2563b35e613f
(get_keymap_1, get_keyelt): Check the type of OBJECT
Karl Heuer <kwzh@gnu.org>
parents:
24572
diff
changeset
|
831 carcar = XCAR (XCAR (object)); |
2563b35e613f
(get_keymap_1, get_keyelt): Check the type of OBJECT
Karl Heuer <kwzh@gnu.org>
parents:
24572
diff
changeset
|
832 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
|
833 object = XCDR (object); |
2563b35e613f
(get_keymap_1, get_keyelt): Check the type of OBJECT
Karl Heuer <kwzh@gnu.org>
parents:
24572
diff
changeset
|
834 } |
21241
31bd04a792c2
(fix_submap_inheritance, get_keyelt, store_in_keymap,
Richard M. Stallman <rms@gnu.org>
parents:
20883
diff
changeset
|
835 } |
31bd04a792c2
(fix_submap_inheritance, get_keyelt, store_in_keymap,
Richard M. Stallman <rms@gnu.org>
parents:
20883
diff
changeset
|
836 |
25128
2563b35e613f
(get_keymap_1, get_keyelt): Check the type of OBJECT
Karl Heuer <kwzh@gnu.org>
parents:
24572
diff
changeset
|
837 /* If the contents are (KEYMAP . ELEMENT), go indirect. */ |
250 | 838 else |
25128
2563b35e613f
(get_keymap_1, get_keyelt): Check the type of OBJECT
Karl Heuer <kwzh@gnu.org>
parents:
24572
diff
changeset
|
839 { |
45279
220c13a65624
(keymap_parent): New fun, extracted from Fkeymap_parent.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
45235
diff
changeset
|
840 struct gcpro gcpro1; |
30134
784ef95b020b
(get_keymap_1): Add comment that this function can GC.
Gerd Moellmann <gerd@gnu.org>
parents:
30030
diff
changeset
|
841 Lisp_Object map; |
45279
220c13a65624
(keymap_parent): New fun, extracted from Fkeymap_parent.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
45235
diff
changeset
|
842 GCPRO1 (object); |
32988
c3435dc00ed7
* lisp.h (KEYMAPP): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
32889
diff
changeset
|
843 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
|
844 UNGCPRO; |
32988
c3435dc00ed7
* lisp.h (KEYMAPP): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
32889
diff
changeset
|
845 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
|
846 : 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
|
847 } |
250 | 848 } |
849 } | |
850 | |
31232
5213900983ed
(store_in_keymap): Add `static' to declaration.
Dave Love <fx@gnu.org>
parents:
31208
diff
changeset
|
851 static Lisp_Object |
250 | 852 store_in_keymap (keymap, idx, def) |
853 Lisp_Object keymap; | |
854 register Lisp_Object idx; | |
855 register Lisp_Object def; | |
856 { | |
32889
673e3ef1f7f6
(where_is_cache, where_is_cache_keymaps): New vars.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
32846
diff
changeset
|
857 /* 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
|
858 where_is_cache = Qnil; |
673e3ef1f7f6
(where_is_cache, where_is_cache_keymaps): New vars.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
32846
diff
changeset
|
859 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
|
860 |
10367
e1c7a3f0c15f
(store_in_keymap): Copy a cons only if car is a string.
Richard M. Stallman <rms@gnu.org>
parents:
10305
diff
changeset
|
861 /* 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
|
862 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
|
863 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
|
864 && (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
|
865 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
|
866 |
39689
0572449a62be
(Fkeymap_prompt, Fcurrent_active_maps): New funs.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
39682
diff
changeset
|
867 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
|
868 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
|
869 |
250 | 870 /* If idx is a list (some sort of mouse click, perhaps?), |
871 the index we want to use is the car of the list, which | |
872 ought to be a symbol. */ | |
1315
884c3d7e7172
* keymap.c (access_keymap, store_in_keymap,
Jim Blandy <jimb@redhat.com>
parents:
1264
diff
changeset
|
873 idx = EVENT_HEAD (idx); |
250 | 874 |
1209
1aa2cd425737
* keymap.c (DENSE_TABLE_SIZE): Doc fix.
Jim Blandy <jimb@redhat.com>
parents:
1160
diff
changeset
|
875 /* 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
|
876 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
|
877 if (SYMBOLP (idx)) |
1209
1aa2cd425737
* keymap.c (DENSE_TABLE_SIZE): Doc fix.
Jim Blandy <jimb@redhat.com>
parents:
1160
diff
changeset
|
878 idx = reorder_modifiers (idx); |
3515
9d0af0f2dc0d
(access_keymap, store_in_keymap): Discard meaningless
Richard M. Stallman <rms@gnu.org>
parents:
3425
diff
changeset
|
879 else if (INTEGERP (idx)) |
9d0af0f2dc0d
(access_keymap, store_in_keymap): Discard meaningless
Richard M. Stallman <rms@gnu.org>
parents:
3425
diff
changeset
|
880 /* 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
|
881 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
|
882 XSETFASTINT (idx, XINT (idx) & (CHAR_META | (CHAR_META - 1))); |
250 | 883 |
1209
1aa2cd425737
* keymap.c (DENSE_TABLE_SIZE): Doc fix.
Jim Blandy <jimb@redhat.com>
parents:
1160
diff
changeset
|
884 /* 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
|
885 { |
1aa2cd425737
* keymap.c (DENSE_TABLE_SIZE): Doc fix.
Jim Blandy <jimb@redhat.com>
parents:
1160
diff
changeset
|
886 Lisp_Object tail; |
250 | 887 |
1209
1aa2cd425737
* keymap.c (DENSE_TABLE_SIZE): Doc fix.
Jim Blandy <jimb@redhat.com>
parents:
1160
diff
changeset
|
888 /* 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
|
889 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
|
890 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
|
891 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
|
892 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
|
893 front of the keymap. */ |
6502
18dfda644bc0
(access_keymap, store_in_keymap, Fcopy_keymap, Fdefine_key,
Karl Heuer <kwzh@gnu.org>
parents:
6475
diff
changeset
|
894 Lisp_Object insertion_point; |
1209
1aa2cd425737
* keymap.c (DENSE_TABLE_SIZE): Doc fix.
Jim Blandy <jimb@redhat.com>
parents:
1160
diff
changeset
|
895 |
6502
18dfda644bc0
(access_keymap, store_in_keymap, Fcopy_keymap, Fdefine_key,
Karl Heuer <kwzh@gnu.org>
parents:
6475
diff
changeset
|
896 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
|
897 for (tail = XCDR (keymap); CONSP (tail); tail = XCDR (tail)) |
250 | 898 { |
6502
18dfda644bc0
(access_keymap, store_in_keymap, Fcopy_keymap, Fdefine_key,
Karl Heuer <kwzh@gnu.org>
parents:
6475
diff
changeset
|
899 Lisp_Object elt; |
1209
1aa2cd425737
* keymap.c (DENSE_TABLE_SIZE): Doc fix.
Jim Blandy <jimb@redhat.com>
parents:
1160
diff
changeset
|
900 |
25662
0a7261c1d487
Use XCAR, XCDR, and XFLOAT_DATA instead of explicit member access.
Ken Raeburn <raeburn@raeburn.org>
parents:
25600
diff
changeset
|
901 elt = XCAR (tail); |
9973
1d5a908f201e
(access_keymap): Use type test macros.
Karl Heuer <kwzh@gnu.org>
parents:
9957
diff
changeset
|
902 if (VECTORP (elt)) |
1209
1aa2cd425737
* keymap.c (DENSE_TABLE_SIZE): Doc fix.
Jim Blandy <jimb@redhat.com>
parents:
1160
diff
changeset
|
903 { |
32846
c1b3ab2a1ccc
Use AREF, ASET and ASIZE macros.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
32844
diff
changeset
|
904 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
|
905 { |
32846
c1b3ab2a1ccc
Use AREF, ASET and ASIZE macros.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
32844
diff
changeset
|
906 ASET (elt, XFASTINT (idx), def); |
1209
1aa2cd425737
* keymap.c (DENSE_TABLE_SIZE): Doc fix.
Jim Blandy <jimb@redhat.com>
parents:
1160
diff
changeset
|
907 return def; |
1aa2cd425737
* keymap.c (DENSE_TABLE_SIZE): Doc fix.
Jim Blandy <jimb@redhat.com>
parents:
1160
diff
changeset
|
908 } |
1aa2cd425737
* keymap.c (DENSE_TABLE_SIZE): Doc fix.
Jim Blandy <jimb@redhat.com>
parents:
1160
diff
changeset
|
909 insertion_point = tail; |
9973
1d5a908f201e
(access_keymap): Use type test macros.
Karl Heuer <kwzh@gnu.org>
parents:
9957
diff
changeset
|
910 } |
17788
208d71ea3a4f
(get_keyelt): Handle an indirect entry with meta char.
Richard M. Stallman <rms@gnu.org>
parents:
17511
diff
changeset
|
911 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
|
912 { |
17932
78a128b99e05
(access_keymap, store_in_keymap): Don't look in a char-table
Richard M. Stallman <rms@gnu.org>
parents:
17861
diff
changeset
|
913 /* 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
|
914 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
|
915 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
|
916 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
|
917 { |
41593
bc65be224d92
(access_keymap): Handle t bindings like nil bindings.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
41387
diff
changeset
|
918 Faset (elt, idx, |
bc65be224d92
(access_keymap): Handle t bindings like nil bindings.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
41387
diff
changeset
|
919 /* `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
|
920 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
|
921 unbound entry. */ |
bc65be224d92
(access_keymap): Handle t bindings like nil bindings.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
41387
diff
changeset
|
922 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
|
923 return def; |
208d71ea3a4f
(get_keyelt): Handle an indirect entry with meta char.
Richard M. Stallman <rms@gnu.org>
parents:
17511
diff
changeset
|
924 } |
208d71ea3a4f
(get_keyelt): Handle an indirect entry with meta char.
Richard M. Stallman <rms@gnu.org>
parents:
17511
diff
changeset
|
925 insertion_point = tail; |
208d71ea3a4f
(get_keyelt): Handle an indirect entry with meta char.
Richard M. Stallman <rms@gnu.org>
parents:
17511
diff
changeset
|
926 } |
9973
1d5a908f201e
(access_keymap): Use type test macros.
Karl Heuer <kwzh@gnu.org>
parents:
9957
diff
changeset
|
927 else if (CONSP (elt)) |
1d5a908f201e
(access_keymap): Use type test macros.
Karl Heuer <kwzh@gnu.org>
parents:
9957
diff
changeset
|
928 { |
25662
0a7261c1d487
Use XCAR, XCDR, and XFLOAT_DATA instead of explicit member access.
Ken Raeburn <raeburn@raeburn.org>
parents:
25600
diff
changeset
|
929 if (EQ (idx, XCAR (elt))) |
1209
1aa2cd425737
* keymap.c (DENSE_TABLE_SIZE): Doc fix.
Jim Blandy <jimb@redhat.com>
parents:
1160
diff
changeset
|
930 { |
39973
579177964efa
Avoid (most) uses of XCAR/XCDR as lvalues, for flexibility in experimenting
Ken Raeburn <raeburn@raeburn.org>
parents:
39940
diff
changeset
|
931 XSETCDR (elt, def); |
1209
1aa2cd425737
* keymap.c (DENSE_TABLE_SIZE): Doc fix.
Jim Blandy <jimb@redhat.com>
parents:
1160
diff
changeset
|
932 return def; |
1aa2cd425737
* keymap.c (DENSE_TABLE_SIZE): Doc fix.
Jim Blandy <jimb@redhat.com>
parents:
1160
diff
changeset
|
933 } |
9973
1d5a908f201e
(access_keymap): Use type test macros.
Karl Heuer <kwzh@gnu.org>
parents:
9957
diff
changeset
|
934 } |
32846
c1b3ab2a1ccc
Use AREF, ASET and ASIZE macros.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
32844
diff
changeset
|
935 else if (EQ (elt, Qkeymap)) |
c1b3ab2a1ccc
Use AREF, ASET and ASIZE macros.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
32844
diff
changeset
|
936 /* 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
|
937 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
|
938 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
|
939 should be inserted before it. */ |
c1b3ab2a1ccc
Use AREF, ASET and ASIZE macros.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
32844
diff
changeset
|
940 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
|
941 |
929409595312
* keymap.c (store_in_keymap): Don't forget to QUIT in the
Jim Blandy <jimb@redhat.com>
parents:
1388
diff
changeset
|
942 QUIT; |
250 | 943 } |
1209
1aa2cd425737
* keymap.c (DENSE_TABLE_SIZE): Doc fix.
Jim Blandy <jimb@redhat.com>
parents:
1160
diff
changeset
|
944 |
1aa2cd425737
* keymap.c (DENSE_TABLE_SIZE): Doc fix.
Jim Blandy <jimb@redhat.com>
parents:
1160
diff
changeset
|
945 keymap_end: |
1aa2cd425737
* keymap.c (DENSE_TABLE_SIZE): Doc fix.
Jim Blandy <jimb@redhat.com>
parents:
1160
diff
changeset
|
946 /* 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
|
947 IDX. Let's add one. */ |
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 (insertion_point, |
579177964efa
Avoid (most) uses of XCAR/XCDR as lvalues, for flexibility in experimenting
Ken Raeburn <raeburn@raeburn.org>
parents:
39940
diff
changeset
|
949 Fcons (Fcons (idx, def), XCDR (insertion_point))); |
250 | 950 } |
45279
220c13a65624
(keymap_parent): New fun, extracted from Fkeymap_parent.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
45235
diff
changeset
|
951 |
250 | 952 return def; |
953 } | |
954 | |
39837
ccaa40660e40
(Fkey_description): Use empty_string.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
39702
diff
changeset
|
955 EXFUN (Fcopy_keymap, 1); |
ccaa40660e40
(Fkey_description): Use empty_string.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
39702
diff
changeset
|
956 |
45279
220c13a65624
(keymap_parent): New fun, extracted from Fkeymap_parent.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
45235
diff
changeset
|
957 Lisp_Object |
220c13a65624
(keymap_parent): New fun, extracted from Fkeymap_parent.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
45235
diff
changeset
|
958 copy_keymap_item (elt) |
220c13a65624
(keymap_parent): New fun, extracted from Fkeymap_parent.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
45235
diff
changeset
|
959 Lisp_Object elt; |
220c13a65624
(keymap_parent): New fun, extracted from Fkeymap_parent.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
45235
diff
changeset
|
960 { |
220c13a65624
(keymap_parent): New fun, extracted from Fkeymap_parent.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
45235
diff
changeset
|
961 Lisp_Object res, tem; |
220c13a65624
(keymap_parent): New fun, extracted from Fkeymap_parent.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
45235
diff
changeset
|
962 |
220c13a65624
(keymap_parent): New fun, extracted from Fkeymap_parent.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
45235
diff
changeset
|
963 if (!CONSP (elt)) |
220c13a65624
(keymap_parent): New fun, extracted from Fkeymap_parent.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
45235
diff
changeset
|
964 return elt; |
220c13a65624
(keymap_parent): New fun, extracted from Fkeymap_parent.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
45235
diff
changeset
|
965 |
220c13a65624
(keymap_parent): New fun, extracted from Fkeymap_parent.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
45235
diff
changeset
|
966 res = tem = elt; |
220c13a65624
(keymap_parent): New fun, extracted from Fkeymap_parent.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
45235
diff
changeset
|
967 |
220c13a65624
(keymap_parent): New fun, extracted from Fkeymap_parent.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
45235
diff
changeset
|
968 /* 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
|
969 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
|
970 { |
220c13a65624
(keymap_parent): New fun, extracted from Fkeymap_parent.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
45235
diff
changeset
|
971 /* 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
|
972 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
|
973 tem = XCDR (elt); |
220c13a65624
(keymap_parent): New fun, extracted from Fkeymap_parent.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
45235
diff
changeset
|
974 if (CONSP (tem)) |
220c13a65624
(keymap_parent): New fun, extracted from Fkeymap_parent.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
45235
diff
changeset
|
975 { |
220c13a65624
(keymap_parent): New fun, extracted from Fkeymap_parent.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
45235
diff
changeset
|
976 /* 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
|
977 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
|
978 elt = XCDR (elt); |
220c13a65624
(keymap_parent): New fun, extracted from Fkeymap_parent.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
45235
diff
changeset
|
979 tem = XCDR (elt); |
220c13a65624
(keymap_parent): New fun, extracted from Fkeymap_parent.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
45235
diff
changeset
|
980 } |
220c13a65624
(keymap_parent): New fun, extracted from Fkeymap_parent.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
45235
diff
changeset
|
981 if (CONSP (tem)) |
220c13a65624
(keymap_parent): New fun, extracted from Fkeymap_parent.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
45235
diff
changeset
|
982 { |
220c13a65624
(keymap_parent): New fun, extracted from Fkeymap_parent.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
45235
diff
changeset
|
983 /* 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
|
984 copy that. */ |
220c13a65624
(keymap_parent): New fun, extracted from Fkeymap_parent.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
45235
diff
changeset
|
985 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
|
986 elt = XCDR (elt); |
220c13a65624
(keymap_parent): New fun, extracted from Fkeymap_parent.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
45235
diff
changeset
|
987 tem = XCAR (elt); |
220c13a65624
(keymap_parent): New fun, extracted from Fkeymap_parent.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
45235
diff
changeset
|
988 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
|
989 XSETCAR (elt, Fcopy_keymap (tem)); |
220c13a65624
(keymap_parent): New fun, extracted from Fkeymap_parent.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
45235
diff
changeset
|
990 tem = XCDR (elt); |
220c13a65624
(keymap_parent): New fun, extracted from Fkeymap_parent.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
45235
diff
changeset
|
991 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
|
992 /* Delete cache for key equivalences. */ |
220c13a65624
(keymap_parent): New fun, extracted from Fkeymap_parent.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
45235
diff
changeset
|
993 XSETCDR (elt, XCDR (tem)); |
220c13a65624
(keymap_parent): New fun, extracted from Fkeymap_parent.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
45235
diff
changeset
|
994 } |
220c13a65624
(keymap_parent): New fun, extracted from Fkeymap_parent.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
45235
diff
changeset
|
995 } |
220c13a65624
(keymap_parent): New fun, extracted from Fkeymap_parent.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
45235
diff
changeset
|
996 else |
220c13a65624
(keymap_parent): New fun, extracted from Fkeymap_parent.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
45235
diff
changeset
|
997 { |
220c13a65624
(keymap_parent): New fun, extracted from Fkeymap_parent.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
45235
diff
changeset
|
998 /* 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
|
999 Skip the optional menu string. */ |
220c13a65624
(keymap_parent): New fun, extracted from Fkeymap_parent.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
45235
diff
changeset
|
1000 if (STRINGP (XCAR (tem))) |
220c13a65624
(keymap_parent): New fun, extracted from Fkeymap_parent.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
45235
diff
changeset
|
1001 { |
220c13a65624
(keymap_parent): New fun, extracted from Fkeymap_parent.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
45235
diff
changeset
|
1002 /* 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
|
1003 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
|
1004 tem = XCDR (elt); |
220c13a65624
(keymap_parent): New fun, extracted from Fkeymap_parent.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
45235
diff
changeset
|
1005 /* 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
|
1006 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
|
1007 { |
220c13a65624
(keymap_parent): New fun, extracted from Fkeymap_parent.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
45235
diff
changeset
|
1008 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
|
1009 elt = XCDR (elt); |
220c13a65624
(keymap_parent): New fun, extracted from Fkeymap_parent.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
45235
diff
changeset
|
1010 tem = XCDR (elt); |
220c13a65624
(keymap_parent): New fun, extracted from Fkeymap_parent.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
45235
diff
changeset
|
1011 } |
220c13a65624
(keymap_parent): New fun, extracted from Fkeymap_parent.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
45235
diff
changeset
|
1012 /* 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
|
1013 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
|
1014 if (CONSP (tem) |
220c13a65624
(keymap_parent): New fun, extracted from Fkeymap_parent.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
45235
diff
changeset
|
1015 && CONSP (XCAR (tem)) |
220c13a65624
(keymap_parent): New fun, extracted from Fkeymap_parent.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
45235
diff
changeset
|
1016 && (NILP (XCAR (XCAR (tem))) |
220c13a65624
(keymap_parent): New fun, extracted from Fkeymap_parent.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
45235
diff
changeset
|
1017 || VECTORP (XCAR (XCAR (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 XSETCDR (elt, XCDR (tem)); |
220c13a65624
(keymap_parent): New fun, extracted from Fkeymap_parent.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
45235
diff
changeset
|
1020 tem = XCDR (tem); |
220c13a65624
(keymap_parent): New fun, extracted from Fkeymap_parent.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
45235
diff
changeset
|
1021 } |
220c13a65624
(keymap_parent): New fun, extracted from Fkeymap_parent.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
45235
diff
changeset
|
1022 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
|
1023 XSETCDR (elt, Fcopy_keymap (tem)); |
220c13a65624
(keymap_parent): New fun, extracted from Fkeymap_parent.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
45235
diff
changeset
|
1024 } |
220c13a65624
(keymap_parent): New fun, extracted from Fkeymap_parent.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
45235
diff
changeset
|
1025 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
|
1026 res = Fcopy_keymap (elt); |
220c13a65624
(keymap_parent): New fun, extracted from Fkeymap_parent.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
45235
diff
changeset
|
1027 } |
220c13a65624
(keymap_parent): New fun, extracted from Fkeymap_parent.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
45235
diff
changeset
|
1028 return res; |
220c13a65624
(keymap_parent): New fun, extracted from Fkeymap_parent.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
45235
diff
changeset
|
1029 } |
220c13a65624
(keymap_parent): New fun, extracted from Fkeymap_parent.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
45235
diff
changeset
|
1030 |
49912
e9f8f5a9cef6
(copy_keymap_1): Make it static.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49902
diff
changeset
|
1031 static void |
17788
208d71ea3a4f
(get_keyelt): Handle an indirect entry with meta char.
Richard M. Stallman <rms@gnu.org>
parents:
17511
diff
changeset
|
1032 copy_keymap_1 (chartable, idx, elt) |
208d71ea3a4f
(get_keyelt): Handle an indirect entry with meta char.
Richard M. Stallman <rms@gnu.org>
parents:
17511
diff
changeset
|
1033 Lisp_Object chartable, idx, elt; |
208d71ea3a4f
(get_keyelt): Handle an indirect entry with meta char.
Richard M. Stallman <rms@gnu.org>
parents:
17511
diff
changeset
|
1034 { |
45279
220c13a65624
(keymap_parent): New fun, extracted from Fkeymap_parent.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
45235
diff
changeset
|
1035 Faset (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
|
1036 } |
1209
1aa2cd425737
* keymap.c (DENSE_TABLE_SIZE): Doc fix.
Jim Blandy <jimb@redhat.com>
parents:
1160
diff
changeset
|
1037 |
250 | 1038 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
|
1039 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
|
1040 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
|
1041 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
|
1042 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
|
1043 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
|
1044 is not copied. */) |
a17c8b15ef1b
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
40804
diff
changeset
|
1045 (keymap) |
250 | 1046 Lisp_Object keymap; |
1047 { | |
1048 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
|
1049 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
|
1050 copy = tail = Fcons (Qkeymap, Qnil); |
220c13a65624
(keymap_parent): New fun, extracted from Fkeymap_parent.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
45235
diff
changeset
|
1051 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
|
1052 |
220c13a65624
(keymap_parent): New fun, extracted from Fkeymap_parent.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
45235
diff
changeset
|
1053 while (CONSP (keymap) && !EQ (XCAR (keymap), Qkeymap)) |
250 | 1054 { |
45279
220c13a65624
(keymap_parent): New fun, extracted from Fkeymap_parent.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
45235
diff
changeset
|
1055 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
|
1056 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
|
1057 { |
20076
374e09781f08
(Faccessible_keymaps): Avoid alloca for fixed-size array.
Karl Heuer <kwzh@gnu.org>
parents:
20070
diff
changeset
|
1058 Lisp_Object indices[3]; |
17788
208d71ea3a4f
(get_keyelt): Handle an indirect entry with meta char.
Richard M. Stallman <rms@gnu.org>
parents:
17511
diff
changeset
|
1059 elt = Fcopy_sequence (elt); |
51034
a5bb1c5181ac
(Fset_keymap_parent, map_keymap, Fcopy_keymap)
Richard M. Stallman <rms@gnu.org>
parents:
50828
diff
changeset
|
1060 map_char_table (copy_keymap_1, Qnil, elt, elt, elt, 0, indices); |
17788
208d71ea3a4f
(get_keyelt): Handle an indirect entry with meta char.
Richard M. Stallman <rms@gnu.org>
parents:
17511
diff
changeset
|
1061 } |
208d71ea3a4f
(get_keyelt): Handle an indirect entry with meta char.
Richard M. Stallman <rms@gnu.org>
parents:
17511
diff
changeset
|
1062 else if (VECTORP (elt)) |
250 | 1063 { |
1209
1aa2cd425737
* keymap.c (DENSE_TABLE_SIZE): Doc fix.
Jim Blandy <jimb@redhat.com>
parents:
1160
diff
changeset
|
1064 int i; |
1aa2cd425737
* keymap.c (DENSE_TABLE_SIZE): Doc fix.
Jim Blandy <jimb@redhat.com>
parents:
1160
diff
changeset
|
1065 elt = Fcopy_sequence (elt); |
32846
c1b3ab2a1ccc
Use AREF, ASET and ASIZE macros.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
32844
diff
changeset
|
1066 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
|
1067 ASET (elt, i, copy_keymap_item (AREF (elt, i))); |
250 | 1068 } |
45279
220c13a65624
(keymap_parent): New fun, extracted from Fkeymap_parent.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
45235
diff
changeset
|
1069 else if (CONSP (elt)) |
220c13a65624
(keymap_parent): New fun, extracted from Fkeymap_parent.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
45235
diff
changeset
|
1070 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
|
1071 XSETCDR (tail, Fcons (elt, Qnil)); |
220c13a65624
(keymap_parent): New fun, extracted from Fkeymap_parent.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
45235
diff
changeset
|
1072 tail = XCDR (tail); |
220c13a65624
(keymap_parent): New fun, extracted from Fkeymap_parent.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
45235
diff
changeset
|
1073 keymap = XCDR (keymap); |
250 | 1074 } |
45279
220c13a65624
(keymap_parent): New fun, extracted from Fkeymap_parent.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
45235
diff
changeset
|
1075 XSETCDR (tail, keymap); |
250 | 1076 return copy; |
1077 } | |
1078 | |
465 | 1079 /* Simple Keymap mutators and accessors. */ |
1080 | |
7998
d4b5f4dd9c51
(Flookup_key): Add gcpro.
Richard M. Stallman <rms@gnu.org>
parents:
7894
diff
changeset
|
1081 /* 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
|
1082 |
250 | 1083 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
|
1084 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
|
1085 KEYMAP is a keymap. |
0029b0259426
(Fdefine_key): Allow symbol as KEY argument for
Kim F. Storm <storm@cua.dk>
parents:
42510
diff
changeset
|
1086 |
0029b0259426
(Fdefine_key): Allow symbol as KEY argument for
Kim F. Storm <storm@cua.dk>
parents:
42510
diff
changeset
|
1087 KEY is a string or a vector of symbols and characters meaning a |
0029b0259426
(Fdefine_key): Allow symbol as KEY argument for
Kim F. Storm <storm@cua.dk>
parents:
42510
diff
changeset
|
1088 sequence of keystrokes and events. Non-ASCII characters with codes |
0029b0259426
(Fdefine_key): Allow symbol as KEY argument for
Kim F. Storm <storm@cua.dk>
parents:
42510
diff
changeset
|
1089 above 127 (such as ISO Latin-1) can be included if you use a vector. |
46142
03d01403f6b7
(Fdefine_key): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
46133
diff
changeset
|
1090 Using [t] for KEY creates a default definition, which applies to any |
49868
466824c9db4a
Typo in docstring for define-key.
Kai Großjohann <kgrossjo@eu.uu.net>
parents:
49757
diff
changeset
|
1091 event type that has no other definition in this keymap. |
43152
0029b0259426
(Fdefine_key): Allow symbol as KEY argument for
Kim F. Storm <storm@cua.dk>
parents:
42510
diff
changeset
|
1092 |
41001
a17c8b15ef1b
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
40804
diff
changeset
|
1093 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
|
1094 nil (means key is undefined in this keymap), |
55722
623ab06bb37b
(Fdefine_key): Doc fix.
Juanma Barranquero <lekktu@gmail.com>
parents:
55006
diff
changeset
|
1095 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
|
1096 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
|
1097 a keymap (to define a prefix key), |
55722
623ab06bb37b
(Fdefine_key): Doc fix.
Juanma Barranquero <lekktu@gmail.com>
parents:
55006
diff
changeset
|
1098 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
|
1099 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
|
1100 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
|
1101 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
|
1102 (DEFN should be a valid definition in its own right), |
55722
623ab06bb37b
(Fdefine_key): Doc fix.
Juanma Barranquero <lekktu@gmail.com>
parents:
55006
diff
changeset
|
1103 or a cons (MAP . CHAR), meaning use definition of CHAR in keymap MAP. |
41001
a17c8b15ef1b
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
40804
diff
changeset
|
1104 |
49901
71b3917cf40b
(Fdefine_key): Doc fix.
Kai Großjohann <kgrossjo@eu.uu.net>
parents:
49868
diff
changeset
|
1105 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
|
1106 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
|
1107 binding KEY to DEF is added at the front of KEYMAP. */) |
41001
a17c8b15ef1b
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
40804
diff
changeset
|
1108 (keymap, key, def) |
1517
72b7bbcaf7d8
* keymap.c (Fdefine_key, Flookup_key, describe_map): Don't assume
Jim Blandy <jimb@redhat.com>
parents:
1441
diff
changeset
|
1109 Lisp_Object keymap; |
250 | 1110 Lisp_Object key; |
1111 Lisp_Object def; | |
1112 { | |
1113 register int idx; | |
1114 register Lisp_Object c; | |
1115 register Lisp_Object cmd; | |
1116 int metized = 0; | |
2059 | 1117 int meta_bit; |
250 | 1118 int length; |
1517
72b7bbcaf7d8
* keymap.c (Fdefine_key, Flookup_key, describe_map): Don't assume
Jim Blandy <jimb@redhat.com>
parents:
1441
diff
changeset
|
1119 struct gcpro gcpro1, gcpro2, gcpro3; |
250 | 1120 |
45279
220c13a65624
(keymap_parent): New fun, extracted from Fkeymap_parent.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
45235
diff
changeset
|
1121 GCPRO3 (keymap, key, def); |
32988
c3435dc00ed7
* lisp.h (KEYMAPP): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
32889
diff
changeset
|
1122 keymap = get_keymap (keymap, 1, 1); |
250 | 1123 |
43494
b5b76b498398
The following changes rework my patch of 2002-02-06 which
Kim F. Storm <storm@cua.dk>
parents:
43164
diff
changeset
|
1124 if (!VECTORP (key) && !STRINGP (key)) |
45279
220c13a65624
(keymap_parent): New fun, extracted from Fkeymap_parent.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
45235
diff
changeset
|
1125 key = wrong_type_argument (Qarrayp, key); |
250 | 1126 |
1517
72b7bbcaf7d8
* keymap.c (Fdefine_key, Flookup_key, describe_map): Don't assume
Jim Blandy <jimb@redhat.com>
parents:
1441
diff
changeset
|
1127 length = XFASTINT (Flength (key)); |
250 | 1128 if (length == 0) |
45279
220c13a65624
(keymap_parent): New fun, extracted from Fkeymap_parent.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
45235
diff
changeset
|
1129 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
|
1130 |
12297
fe458a8ecfa2
(Vdefine_key_rebound_commands): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
12262
diff
changeset
|
1131 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
|
1132 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
|
1133 |
45279
220c13a65624
(keymap_parent): New fun, extracted from Fkeymap_parent.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
45235
diff
changeset
|
1134 meta_bit = VECTORP (key) ? meta_modifier : 0x80; |
2059 | 1135 |
250 | 1136 idx = 0; |
1137 while (1) | |
1138 { | |
1139 c = Faref (key, make_number (idx)); | |
1140 | |
10840
3a7336f191b9
(Fdefine_key): Handle Lucid-style (crtl backspace) etc.
Richard M. Stallman <rms@gnu.org>
parents:
10810
diff
changeset
|
1141 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
|
1142 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
|
1143 |
42404
ca040d0f5c67
(silly_event_symbol_error): New subrtn, from Fdefine_key.
Richard M. Stallman <rms@gnu.org>
parents:
42381
diff
changeset
|
1144 if (SYMBOLP (c)) |
ca040d0f5c67
(silly_event_symbol_error): New subrtn, from Fdefine_key.
Richard M. Stallman <rms@gnu.org>
parents:
42381
diff
changeset
|
1145 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
|
1146 |
9123
c225137ddefb
(get_keyelt, store_in_keymap, Fcopy_keymap, Fdefine_key, Flookup_key,
Karl Heuer <kwzh@gnu.org>
parents:
8922
diff
changeset
|
1147 if (INTEGERP (c) |
2059 | 1148 && (XINT (c) & meta_bit) |
250 | 1149 && !metized) |
1150 { | |
1151 c = meta_prefix_char; | |
1152 metized = 1; | |
1153 } | |
1154 else | |
1155 { | |
9123
c225137ddefb
(get_keyelt, store_in_keymap, Fcopy_keymap, Fdefine_key, Flookup_key,
Karl Heuer <kwzh@gnu.org>
parents:
8922
diff
changeset
|
1156 if (INTEGERP (c)) |
2093
ce8bad247b1a
(Fdefine_key): Use proper meta-bit to clear.
Richard M. Stallman <rms@gnu.org>
parents:
2059
diff
changeset
|
1157 XSETINT (c, XINT (c) & ~meta_bit); |
250 | 1158 |
1159 metized = 0; | |
1160 idx++; | |
1161 } | |
1162 | |
39689
0572449a62be
(Fkeymap_prompt, Fcurrent_active_maps): New funs.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
39682
diff
changeset
|
1163 if (!INTEGERP (c) && !SYMBOLP (c) && !CONSP (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
|
1164 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
|
1165 |
250 | 1166 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
|
1167 RETURN_UNGCPRO (store_in_keymap (keymap, c, def)); |
250 | 1168 |
32476
9b2a0dc393a4
* keymap.c (access_keymap): Add AUTOLOAD parameter.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
32145
diff
changeset
|
1169 cmd = access_keymap (keymap, c, 0, 1, 1); |
250 | 1170 |
3735
7193a99a87c1
Make prefix keys work with keymap inheritance
Richard M. Stallman <rms@gnu.org>
parents:
3691
diff
changeset
|
1171 /* If this key is undefined, make it a prefix. */ |
485 | 1172 if (NILP (cmd)) |
3735
7193a99a87c1
Make prefix keys work with keymap inheritance
Richard M. Stallman <rms@gnu.org>
parents:
3691
diff
changeset
|
1173 cmd = define_as_prefix (keymap, c); |
250 | 1174 |
32988
c3435dc00ed7
* lisp.h (KEYMAPP): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
32889
diff
changeset
|
1175 keymap = get_keymap (cmd, 0, 1); |
c3435dc00ed7
* lisp.h (KEYMAPP): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
32889
diff
changeset
|
1176 if (!CONSP (keymap)) |
6502
18dfda644bc0
(access_keymap, store_in_keymap, Fcopy_keymap, Fdefine_key,
Karl Heuer <kwzh@gnu.org>
parents:
6475
diff
changeset
|
1177 /* 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
|
1178 error; key might be a vector, not a string. */ |
18dfda644bc0
(access_keymap, store_in_keymap, Fcopy_keymap, Fdefine_key,
Karl Heuer <kwzh@gnu.org>
parents:
6475
diff
changeset
|
1179 error ("Key sequence %s uses invalid prefix characters", |
54925
f0a7441d22f6
(Fkey_description): Add optional PREFIX arg.
Kim F. Storm <storm@cua.dk>
parents:
53808
diff
changeset
|
1180 SDATA (Fkey_description (key, Qnil))); |
250 | 1181 } |
1182 } | |
1183 | |
43494
b5b76b498398
The following changes rework my patch of 2002-02-06 which
Kim F. Storm <storm@cua.dk>
parents:
43164
diff
changeset
|
1184 /* 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
|
1185 |
49757
9fe119b14379
Renamed remap-command to command-remapping. All uses changed.
Kim F. Storm <storm@cua.dk>
parents:
49720
diff
changeset
|
1186 DEFUN ("command-remapping", Fcommand_remapping, Scommand_remapping, 1, 1, 0, |
43494
b5b76b498398
The following changes rework my patch of 2002-02-06 which
Kim F. Storm <storm@cua.dk>
parents:
43164
diff
changeset
|
1187 doc: /* Return the remapping for command COMMAND in current keymaps. |
49720
e4fcec69ba69
(Fremap_command): Return nil if arg is not a symbol.
Kim F. Storm <storm@cua.dk>
parents:
49059
diff
changeset
|
1188 Returns nil if COMMAND is not remapped (or not a symbol). */) |
43494
b5b76b498398
The following changes rework my patch of 2002-02-06 which
Kim F. Storm <storm@cua.dk>
parents:
43164
diff
changeset
|
1189 (command) |
b5b76b498398
The following changes rework my patch of 2002-02-06 which
Kim F. Storm <storm@cua.dk>
parents:
43164
diff
changeset
|
1190 Lisp_Object command; |
b5b76b498398
The following changes rework my patch of 2002-02-06 which
Kim F. Storm <storm@cua.dk>
parents:
43164
diff
changeset
|
1191 { |
49720
e4fcec69ba69
(Fremap_command): Return nil if arg is not a symbol.
Kim F. Storm <storm@cua.dk>
parents:
49059
diff
changeset
|
1192 if (!SYMBOLP (command)) |
e4fcec69ba69
(Fremap_command): Return nil if arg is not a symbol.
Kim F. Storm <storm@cua.dk>
parents:
49059
diff
changeset
|
1193 return Qnil; |
e4fcec69ba69
(Fremap_command): Return nil if arg is not a symbol.
Kim F. Storm <storm@cua.dk>
parents:
49059
diff
changeset
|
1194 |
49757
9fe119b14379
Renamed remap-command to command-remapping. All uses changed.
Kim F. Storm <storm@cua.dk>
parents:
49720
diff
changeset
|
1195 ASET (command_remapping_vector, 1, command); |
9fe119b14379
Renamed remap-command to command-remapping. All uses changed.
Kim F. Storm <storm@cua.dk>
parents:
49720
diff
changeset
|
1196 return Fkey_binding (command_remapping_vector, Qnil, Qt); |
43494
b5b76b498398
The following changes rework my patch of 2002-02-06 which
Kim F. Storm <storm@cua.dk>
parents:
43164
diff
changeset
|
1197 } |
b5b76b498398
The following changes rework my patch of 2002-02-06 which
Kim F. Storm <storm@cua.dk>
parents:
43164
diff
changeset
|
1198 |
42206 | 1199 /* 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
|
1200 /* GC is possible in this function if it autoloads a keymap. */ |
250 | 1201 |
1871
00bee181f7ed
* keymap.c (Flookup_key, Fkey_binding, Flocal_key_binding,
Jim Blandy <jimb@redhat.com>
parents:
1821
diff
changeset
|
1202 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
|
1203 doc: /* In keymap KEYMAP, look up key sequence KEY. Return the definition. |
a17c8b15ef1b
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
40804
diff
changeset
|
1204 nil means undefined. See doc of `define-key' for kinds of definitions. |
a17c8b15ef1b
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
40804
diff
changeset
|
1205 |
a17c8b15ef1b
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
40804
diff
changeset
|
1206 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
|
1207 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
|
1208 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
|
1209 The number is how many characters at the front of KEY |
a17c8b15ef1b
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
40804
diff
changeset
|
1210 it takes to reach a non-prefix command. |
a17c8b15ef1b
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
40804
diff
changeset
|
1211 |
a17c8b15ef1b
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
40804
diff
changeset
|
1212 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
|
1213 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
|
1214 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
|
1215 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
|
1216 recognize the default bindings, just as `read-key-sequence' does. */) |
a17c8b15ef1b
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
40804
diff
changeset
|
1217 (keymap, key, accept_default) |
45279
220c13a65624
(keymap_parent): New fun, extracted from Fkeymap_parent.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
45235
diff
changeset
|
1218 Lisp_Object keymap; |
250 | 1219 Lisp_Object key; |
1871
00bee181f7ed
* keymap.c (Flookup_key, Fkey_binding, Flocal_key_binding,
Jim Blandy <jimb@redhat.com>
parents:
1821
diff
changeset
|
1220 Lisp_Object accept_default; |
250 | 1221 { |
1222 register int idx; | |
1223 register Lisp_Object cmd; | |
1224 register Lisp_Object c; | |
1225 int length; | |
39689
0572449a62be
(Fkeymap_prompt, Fcurrent_active_maps): New funs.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
39682
diff
changeset
|
1226 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
|
1227 struct gcpro gcpro1, gcpro2; |
220c13a65624
(keymap_parent): New fun, extracted from Fkeymap_parent.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
45235
diff
changeset
|
1228 |
220c13a65624
(keymap_parent): New fun, extracted from Fkeymap_parent.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
45235
diff
changeset
|
1229 GCPRO2 (keymap, key); |
32988
c3435dc00ed7
* lisp.h (KEYMAPP): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
32889
diff
changeset
|
1230 keymap = get_keymap (keymap, 1, 1); |
250 | 1231 |
9123
c225137ddefb
(get_keyelt, store_in_keymap, Fcopy_keymap, Fdefine_key, Flookup_key,
Karl Heuer <kwzh@gnu.org>
parents:
8922
diff
changeset
|
1232 if (!VECTORP (key) && !STRINGP (key)) |
250 | 1233 key = wrong_type_argument (Qarrayp, key); |
1234 | |
1517
72b7bbcaf7d8
* keymap.c (Fdefine_key, Flookup_key, describe_map): Don't assume
Jim Blandy <jimb@redhat.com>
parents:
1441
diff
changeset
|
1235 length = XFASTINT (Flength (key)); |
250 | 1236 if (length == 0) |
45279
220c13a65624
(keymap_parent): New fun, extracted from Fkeymap_parent.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
45235
diff
changeset
|
1237 RETURN_UNGCPRO (keymap); |
7998
d4b5f4dd9c51
(Flookup_key): Add gcpro.
Richard M. Stallman <rms@gnu.org>
parents:
7894
diff
changeset
|
1238 |
250 | 1239 idx = 0; |
1240 while (1) | |
1241 { | |
32476
9b2a0dc393a4
* keymap.c (access_keymap): Add AUTOLOAD parameter.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
32145
diff
changeset
|
1242 c = Faref (key, make_number (idx++)); |
250 | 1243 |
10840
3a7336f191b9
(Fdefine_key): Handle Lucid-style (crtl backspace) etc.
Richard M. Stallman <rms@gnu.org>
parents:
10810
diff
changeset
|
1244 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
|
1245 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
|
1246 |
32476
9b2a0dc393a4
* keymap.c (access_keymap): Add AUTOLOAD parameter.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
32145
diff
changeset
|
1247 /* Turn the 8th bit of string chars into a meta modifier. */ |
58450
277e7a013eb6
(Flookup_key): Check INTEGERP before XINT.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
58271
diff
changeset
|
1248 if (INTEGERP (c) && XINT (c) & 0x80 && STRINGP (key)) |
32476
9b2a0dc393a4
* keymap.c (access_keymap): Add AUTOLOAD parameter.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
32145
diff
changeset
|
1249 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
|
1250 |
43504
20832766c3e1
(Flookup_key): Fixed problem in 2001-12-28 patch:
Kim F. Storm <storm@cua.dk>
parents:
43494
diff
changeset
|
1251 /* 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
|
1252 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
|
1253 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
|
1254 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
|
1255 |
32476
9b2a0dc393a4
* keymap.c (access_keymap): Add AUTOLOAD parameter.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
32145
diff
changeset
|
1256 cmd = access_keymap (keymap, c, t_ok, 0, 1); |
250 | 1257 if (idx == length) |
7998
d4b5f4dd9c51
(Flookup_key): Add gcpro.
Richard M. Stallman <rms@gnu.org>
parents:
7894
diff
changeset
|
1258 RETURN_UNGCPRO (cmd); |
250 | 1259 |
32988
c3435dc00ed7
* lisp.h (KEYMAPP): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
32889
diff
changeset
|
1260 keymap = get_keymap (cmd, 0, 1); |
c3435dc00ed7
* lisp.h (KEYMAPP): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
32889
diff
changeset
|
1261 if (!CONSP (keymap)) |
7998
d4b5f4dd9c51
(Flookup_key): Add gcpro.
Richard M. Stallman <rms@gnu.org>
parents:
7894
diff
changeset
|
1262 RETURN_UNGCPRO (make_number (idx)); |
250 | 1263 |
1264 QUIT; | |
1265 } | |
1266 } | |
1267 | |
3735
7193a99a87c1
Make prefix keys work with keymap inheritance
Richard M. Stallman <rms@gnu.org>
parents:
3691
diff
changeset
|
1268 /* 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
|
1269 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
|
1270 Return the keymap. */ |
7193a99a87c1
Make prefix keys work with keymap inheritance
Richard M. Stallman <rms@gnu.org>
parents:
3691
diff
changeset
|
1271 |
7193a99a87c1
Make prefix keys work with keymap inheritance
Richard M. Stallman <rms@gnu.org>
parents:
3691
diff
changeset
|
1272 static Lisp_Object |
7193a99a87c1
Make prefix keys work with keymap inheritance
Richard M. Stallman <rms@gnu.org>
parents:
3691
diff
changeset
|
1273 define_as_prefix (keymap, c) |
7193a99a87c1
Make prefix keys work with keymap inheritance
Richard M. Stallman <rms@gnu.org>
parents:
3691
diff
changeset
|
1274 Lisp_Object keymap, c; |
7193a99a87c1
Make prefix keys work with keymap inheritance
Richard M. Stallman <rms@gnu.org>
parents:
3691
diff
changeset
|
1275 { |
32476
9b2a0dc393a4
* keymap.c (access_keymap): Add AUTOLOAD parameter.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
32145
diff
changeset
|
1276 Lisp_Object cmd; |
3735
7193a99a87c1
Make prefix keys work with keymap inheritance
Richard M. Stallman <rms@gnu.org>
parents:
3691
diff
changeset
|
1277 |
7193a99a87c1
Make prefix keys work with keymap inheritance
Richard M. Stallman <rms@gnu.org>
parents:
3691
diff
changeset
|
1278 cmd = Fmake_sparse_keymap (Qnil); |
7193a99a87c1
Make prefix keys work with keymap inheritance
Richard M. Stallman <rms@gnu.org>
parents:
3691
diff
changeset
|
1279 /* 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
|
1280 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
|
1281 inherit the other prefix definition. */ |
32476
9b2a0dc393a4
* keymap.c (access_keymap): Add AUTOLOAD parameter.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
32145
diff
changeset
|
1282 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
|
1283 store_in_keymap (keymap, c, cmd); |
7193a99a87c1
Make prefix keys work with keymap inheritance
Richard M. Stallman <rms@gnu.org>
parents:
3691
diff
changeset
|
1284 |
7193a99a87c1
Make prefix keys work with keymap inheritance
Richard M. Stallman <rms@gnu.org>
parents:
3691
diff
changeset
|
1285 return cmd; |
7193a99a87c1
Make prefix keys work with keymap inheritance
Richard M. Stallman <rms@gnu.org>
parents:
3691
diff
changeset
|
1286 } |
7193a99a87c1
Make prefix keys work with keymap inheritance
Richard M. Stallman <rms@gnu.org>
parents:
3691
diff
changeset
|
1287 |
2093
ce8bad247b1a
(Fdefine_key): Use proper meta-bit to clear.
Richard M. Stallman <rms@gnu.org>
parents:
2059
diff
changeset
|
1288 /* 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
|
1289 |
250 | 1290 Lisp_Object |
1291 append_key (key_sequence, key) | |
1292 Lisp_Object key_sequence, key; | |
1293 { | |
1294 Lisp_Object args[2]; | |
1295 | |
1296 args[0] = key_sequence; | |
1297 | |
2093
ce8bad247b1a
(Fdefine_key): Use proper meta-bit to clear.
Richard M. Stallman <rms@gnu.org>
parents:
2059
diff
changeset
|
1298 args[1] = Fcons (key, Qnil); |
ce8bad247b1a
(Fdefine_key): Use proper meta-bit to clear.
Richard M. Stallman <rms@gnu.org>
parents:
2059
diff
changeset
|
1299 return Fvconcat (2, args); |
250 | 1300 } |
1301 | |
42404
ca040d0f5c67
(silly_event_symbol_error): New subrtn, from Fdefine_key.
Richard M. Stallman <rms@gnu.org>
parents:
42381
diff
changeset
|
1302 /* 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
|
1303 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
|
1304 |
ca040d0f5c67
(silly_event_symbol_error): New subrtn, from Fdefine_key.
Richard M. Stallman <rms@gnu.org>
parents:
42381
diff
changeset
|
1305 static void |
ca040d0f5c67
(silly_event_symbol_error): New subrtn, from Fdefine_key.
Richard M. Stallman <rms@gnu.org>
parents:
42381
diff
changeset
|
1306 silly_event_symbol_error (c) |
ca040d0f5c67
(silly_event_symbol_error): New subrtn, from Fdefine_key.
Richard M. Stallman <rms@gnu.org>
parents:
42381
diff
changeset
|
1307 Lisp_Object c; |
ca040d0f5c67
(silly_event_symbol_error): New subrtn, from Fdefine_key.
Richard M. Stallman <rms@gnu.org>
parents:
42381
diff
changeset
|
1308 { |
ca040d0f5c67
(silly_event_symbol_error): New subrtn, from Fdefine_key.
Richard M. Stallman <rms@gnu.org>
parents:
42381
diff
changeset
|
1309 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
|
1310 int modifiers; |
45619
dbd65bd8bb4f
(describe_command): Cast `current_column' return value to int.
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
45404
diff
changeset
|
1311 |
42404
ca040d0f5c67
(silly_event_symbol_error): New subrtn, from Fdefine_key.
Richard M. Stallman <rms@gnu.org>
parents:
42381
diff
changeset
|
1312 parsed = parse_modifiers (c); |
ca040d0f5c67
(silly_event_symbol_error): New subrtn, from Fdefine_key.
Richard M. Stallman <rms@gnu.org>
parents:
42381
diff
changeset
|
1313 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
|
1314 base = XCAR (parsed); |
ca040d0f5c67
(silly_event_symbol_error): New subrtn, from Fdefine_key.
Richard M. Stallman <rms@gnu.org>
parents:
42381
diff
changeset
|
1315 name = Fsymbol_name (base); |
ca040d0f5c67
(silly_event_symbol_error): New subrtn, from Fdefine_key.
Richard M. Stallman <rms@gnu.org>
parents:
42381
diff
changeset
|
1316 /* 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
|
1317 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
|
1318 |
ca040d0f5c67
(silly_event_symbol_error): New subrtn, from Fdefine_key.
Richard M. Stallman <rms@gnu.org>
parents:
42381
diff
changeset
|
1319 if (! NILP (assoc)) |
ca040d0f5c67
(silly_event_symbol_error): New subrtn, from Fdefine_key.
Richard M. Stallman <rms@gnu.org>
parents:
42381
diff
changeset
|
1320 { |
ca040d0f5c67
(silly_event_symbol_error): New subrtn, from Fdefine_key.
Richard M. Stallman <rms@gnu.org>
parents:
42381
diff
changeset
|
1321 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
|
1322 char *p = new_mods; |
ca040d0f5c67
(silly_event_symbol_error): New subrtn, from Fdefine_key.
Richard M. Stallman <rms@gnu.org>
parents:
42381
diff
changeset
|
1323 Lisp_Object keystring; |
ca040d0f5c67
(silly_event_symbol_error): New subrtn, from Fdefine_key.
Richard M. Stallman <rms@gnu.org>
parents:
42381
diff
changeset
|
1324 if (modifiers & alt_modifier) |
ca040d0f5c67
(silly_event_symbol_error): New subrtn, from Fdefine_key.
Richard M. Stallman <rms@gnu.org>
parents:
42381
diff
changeset
|
1325 { *p++ = '\\'; *p++ = 'A'; *p++ = '-'; } |
ca040d0f5c67
(silly_event_symbol_error): New subrtn, from Fdefine_key.
Richard M. Stallman <rms@gnu.org>
parents:
42381
diff
changeset
|
1326 if (modifiers & ctrl_modifier) |
ca040d0f5c67
(silly_event_symbol_error): New subrtn, from Fdefine_key.
Richard M. Stallman <rms@gnu.org>
parents:
42381
diff
changeset
|
1327 { *p++ = '\\'; *p++ = 'C'; *p++ = '-'; } |
ca040d0f5c67
(silly_event_symbol_error): New subrtn, from Fdefine_key.
Richard M. Stallman <rms@gnu.org>
parents:
42381
diff
changeset
|
1328 if (modifiers & hyper_modifier) |
ca040d0f5c67
(silly_event_symbol_error): New subrtn, from Fdefine_key.
Richard M. Stallman <rms@gnu.org>
parents:
42381
diff
changeset
|
1329 { *p++ = '\\'; *p++ = 'H'; *p++ = '-'; } |
ca040d0f5c67
(silly_event_symbol_error): New subrtn, from Fdefine_key.
Richard M. Stallman <rms@gnu.org>
parents:
42381
diff
changeset
|
1330 if (modifiers & meta_modifier) |
ca040d0f5c67
(silly_event_symbol_error): New subrtn, from Fdefine_key.
Richard M. Stallman <rms@gnu.org>
parents:
42381
diff
changeset
|
1331 { *p++ = '\\'; *p++ = 'M'; *p++ = '-'; } |
ca040d0f5c67
(silly_event_symbol_error): New subrtn, from Fdefine_key.
Richard M. Stallman <rms@gnu.org>
parents:
42381
diff
changeset
|
1332 if (modifiers & shift_modifier) |
ca040d0f5c67
(silly_event_symbol_error): New subrtn, from Fdefine_key.
Richard M. Stallman <rms@gnu.org>
parents:
42381
diff
changeset
|
1333 { *p++ = '\\'; *p++ = 'S'; *p++ = '-'; } |
ca040d0f5c67
(silly_event_symbol_error): New subrtn, from Fdefine_key.
Richard M. Stallman <rms@gnu.org>
parents:
42381
diff
changeset
|
1334 if (modifiers & super_modifier) |
ca040d0f5c67
(silly_event_symbol_error): New subrtn, from Fdefine_key.
Richard M. Stallman <rms@gnu.org>
parents:
42381
diff
changeset
|
1335 { *p++ = '\\'; *p++ = 's'; *p++ = '-'; } |
ca040d0f5c67
(silly_event_symbol_error): New subrtn, from Fdefine_key.
Richard M. Stallman <rms@gnu.org>
parents:
42381
diff
changeset
|
1336 *p = 0; |
ca040d0f5c67
(silly_event_symbol_error): New subrtn, from Fdefine_key.
Richard M. Stallman <rms@gnu.org>
parents:
42381
diff
changeset
|
1337 |
ca040d0f5c67
(silly_event_symbol_error): New subrtn, from Fdefine_key.
Richard M. Stallman <rms@gnu.org>
parents:
42381
diff
changeset
|
1338 c = reorder_modifiers (c); |
ca040d0f5c67
(silly_event_symbol_error): New subrtn, from Fdefine_key.
Richard M. Stallman <rms@gnu.org>
parents:
42381
diff
changeset
|
1339 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
|
1340 |
42404
ca040d0f5c67
(silly_event_symbol_error): New subrtn, from Fdefine_key.
Richard M. Stallman <rms@gnu.org>
parents:
42381
diff
changeset
|
1341 error ((modifiers & ~meta_modifier |
ca040d0f5c67
(silly_event_symbol_error): New subrtn, from Fdefine_key.
Richard M. Stallman <rms@gnu.org>
parents:
42381
diff
changeset
|
1342 ? "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
|
1343 : "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
|
1344 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
|
1345 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
|
1346 } |
ca040d0f5c67
(silly_event_symbol_error): New subrtn, from Fdefine_key.
Richard M. Stallman <rms@gnu.org>
parents:
42381
diff
changeset
|
1347 } |
250 | 1348 |
465 | 1349 /* Global, local, and minor mode keymap stuff. */ |
1350 | |
485 | 1351 /* We can't put these variables inside current_minor_maps, since under |
517 | 1352 some systems, static gets macro-defined to be the empty string. |
1353 Ickypoo. */ | |
45235
66271fa0bf60
(current_minor_maps): Fixed resizing of cmm_maps;
Kim F. Storm <storm@cua.dk>
parents:
45222
diff
changeset
|
1354 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
|
1355 static int cmm_size = 0; |
485 | 1356 |
12542
f86a10208f7e
(current_minor_maps): Catch errors in Findirect_function.
Karl Heuer <kwzh@gnu.org>
parents:
12297
diff
changeset
|
1357 /* Error handler used in current_minor_maps. */ |
f86a10208f7e
(current_minor_maps): Catch errors in Findirect_function.
Karl Heuer <kwzh@gnu.org>
parents:
12297
diff
changeset
|
1358 static Lisp_Object |
f86a10208f7e
(current_minor_maps): Catch errors in Findirect_function.
Karl Heuer <kwzh@gnu.org>
parents:
12297
diff
changeset
|
1359 current_minor_maps_error () |
f86a10208f7e
(current_minor_maps): Catch errors in Findirect_function.
Karl Heuer <kwzh@gnu.org>
parents:
12297
diff
changeset
|
1360 { |
f86a10208f7e
(current_minor_maps): Catch errors in Findirect_function.
Karl Heuer <kwzh@gnu.org>
parents:
12297
diff
changeset
|
1361 return Qnil; |
f86a10208f7e
(current_minor_maps): Catch errors in Findirect_function.
Karl Heuer <kwzh@gnu.org>
parents:
12297
diff
changeset
|
1362 } |
f86a10208f7e
(current_minor_maps): Catch errors in Findirect_function.
Karl Heuer <kwzh@gnu.org>
parents:
12297
diff
changeset
|
1363 |
465 | 1364 /* Store a pointer to an array of the keymaps of the currently active |
1365 minor modes in *buf, and return the number of maps it contains. | |
1366 | |
1367 This function always returns a pointer to the same buffer, and may | |
1368 free or reallocate it, so if you want to keep it for a long time or | |
1369 hand it out to lisp code, copy it. This procedure will be called | |
1370 for every key sequence read, so the nice lispy approach (return a | |
1371 new assoclist, list, what have you) for each invocation would | |
1372 result in a lot of consing over time. | |
1373 | |
1374 If we used xrealloc/xmalloc and ran out of memory, they would throw | |
1375 back to the command loop, which would try to read a key sequence, | |
1376 which would call this function again, resulting in an infinite | |
1377 loop. Instead, we'll use realloc/malloc and silently truncate the | |
1378 list, let the key sequence be read, and hope some other piece of | |
1379 code signals the error. */ | |
1380 int | |
1381 current_minor_maps (modeptr, mapptr) | |
1382 Lisp_Object **modeptr, **mapptr; | |
1383 { | |
1384 int i = 0; | |
20517
40bfe766d355
(Vminor_mode_overriding_map_alist): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
20381
diff
changeset
|
1385 int list_number = 0; |
517 | 1386 Lisp_Object alist, assoc, var, val; |
45222
c525c7445e1b
(Vemulation_mode_map_alists): New variable.
Kim F. Storm <storm@cua.dk>
parents:
43504
diff
changeset
|
1387 Lisp_Object emulation_alists; |
20517
40bfe766d355
(Vminor_mode_overriding_map_alist): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
20381
diff
changeset
|
1388 Lisp_Object lists[2]; |
40bfe766d355
(Vminor_mode_overriding_map_alist): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
20381
diff
changeset
|
1389 |
45222
c525c7445e1b
(Vemulation_mode_map_alists): New variable.
Kim F. Storm <storm@cua.dk>
parents:
43504
diff
changeset
|
1390 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
|
1391 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
|
1392 lists[1] = Vminor_mode_map_alist; |
40bfe766d355
(Vminor_mode_overriding_map_alist): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
20381
diff
changeset
|
1393 |
40bfe766d355
(Vminor_mode_overriding_map_alist): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
20381
diff
changeset
|
1394 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
|
1395 { |
c525c7445e1b
(Vemulation_mode_map_alists): New variable.
Kim F. Storm <storm@cua.dk>
parents:
43504
diff
changeset
|
1396 if (CONSP (emulation_alists)) |
20517
40bfe766d355
(Vminor_mode_overriding_map_alist): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
20381
diff
changeset
|
1397 { |
45222
c525c7445e1b
(Vemulation_mode_map_alists): New variable.
Kim F. Storm <storm@cua.dk>
parents:
43504
diff
changeset
|
1398 alist = XCAR (emulation_alists); |
c525c7445e1b
(Vemulation_mode_map_alists): New variable.
Kim F. Storm <storm@cua.dk>
parents:
43504
diff
changeset
|
1399 emulation_alists = XCDR (emulation_alists); |
c525c7445e1b
(Vemulation_mode_map_alists): New variable.
Kim F. Storm <storm@cua.dk>
parents:
43504
diff
changeset
|
1400 if (SYMBOLP (alist)) |
c525c7445e1b
(Vemulation_mode_map_alists): New variable.
Kim F. Storm <storm@cua.dk>
parents:
43504
diff
changeset
|
1401 alist = find_symbol_value (alist); |
c525c7445e1b
(Vemulation_mode_map_alists): New variable.
Kim F. Storm <storm@cua.dk>
parents:
43504
diff
changeset
|
1402 list_number = -1; |
c525c7445e1b
(Vemulation_mode_map_alists): New variable.
Kim F. Storm <storm@cua.dk>
parents:
43504
diff
changeset
|
1403 } |
c525c7445e1b
(Vemulation_mode_map_alists): New variable.
Kim F. Storm <storm@cua.dk>
parents:
43504
diff
changeset
|
1404 else |
c525c7445e1b
(Vemulation_mode_map_alists): New variable.
Kim F. Storm <storm@cua.dk>
parents:
43504
diff
changeset
|
1405 alist = lists[list_number]; |
c525c7445e1b
(Vemulation_mode_map_alists): New variable.
Kim F. Storm <storm@cua.dk>
parents:
43504
diff
changeset
|
1406 |
c525c7445e1b
(Vemulation_mode_map_alists): New variable.
Kim F. Storm <storm@cua.dk>
parents:
43504
diff
changeset
|
1407 for ( ; CONSP (alist); alist = XCDR (alist)) |
c525c7445e1b
(Vemulation_mode_map_alists): New variable.
Kim F. Storm <storm@cua.dk>
parents:
43504
diff
changeset
|
1408 if ((assoc = XCAR (alist), CONSP (assoc)) |
c525c7445e1b
(Vemulation_mode_map_alists): New variable.
Kim F. Storm <storm@cua.dk>
parents:
43504
diff
changeset
|
1409 && (var = XCAR (assoc), SYMBOLP (var)) |
c525c7445e1b
(Vemulation_mode_map_alists): New variable.
Kim F. Storm <storm@cua.dk>
parents:
43504
diff
changeset
|
1410 && (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
|
1411 && !NILP (val)) |
c525c7445e1b
(Vemulation_mode_map_alists): New variable.
Kim F. Storm <storm@cua.dk>
parents:
43504
diff
changeset
|
1412 { |
c525c7445e1b
(Vemulation_mode_map_alists): New variable.
Kim F. Storm <storm@cua.dk>
parents:
43504
diff
changeset
|
1413 Lisp_Object temp; |
c525c7445e1b
(Vemulation_mode_map_alists): New variable.
Kim F. Storm <storm@cua.dk>
parents:
43504
diff
changeset
|
1414 |
c525c7445e1b
(Vemulation_mode_map_alists): New variable.
Kim F. Storm <storm@cua.dk>
parents:
43504
diff
changeset
|
1415 /* 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
|
1416 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
|
1417 ignore the latter. */ |
c525c7445e1b
(Vemulation_mode_map_alists): New variable.
Kim F. Storm <storm@cua.dk>
parents:
43504
diff
changeset
|
1418 if (list_number == 1) |
c525c7445e1b
(Vemulation_mode_map_alists): New variable.
Kim F. Storm <storm@cua.dk>
parents:
43504
diff
changeset
|
1419 { |
c525c7445e1b
(Vemulation_mode_map_alists): New variable.
Kim F. Storm <storm@cua.dk>
parents:
43504
diff
changeset
|
1420 val = assq_no_quit (var, lists[0]); |
c525c7445e1b
(Vemulation_mode_map_alists): New variable.
Kim F. Storm <storm@cua.dk>
parents:
43504
diff
changeset
|
1421 if (!NILP (val)) |
c525c7445e1b
(Vemulation_mode_map_alists): New variable.
Kim F. Storm <storm@cua.dk>
parents:
43504
diff
changeset
|
1422 continue; |
c525c7445e1b
(Vemulation_mode_map_alists): New variable.
Kim F. Storm <storm@cua.dk>
parents:
43504
diff
changeset
|
1423 } |
c525c7445e1b
(Vemulation_mode_map_alists): New variable.
Kim F. Storm <storm@cua.dk>
parents:
43504
diff
changeset
|
1424 |
c525c7445e1b
(Vemulation_mode_map_alists): New variable.
Kim F. Storm <storm@cua.dk>
parents:
43504
diff
changeset
|
1425 if (i >= cmm_size) |
c525c7445e1b
(Vemulation_mode_map_alists): New variable.
Kim F. Storm <storm@cua.dk>
parents:
43504
diff
changeset
|
1426 { |
45235
66271fa0bf60
(current_minor_maps): Fixed resizing of cmm_maps;
Kim F. Storm <storm@cua.dk>
parents:
45222
diff
changeset
|
1427 int newsize, allocsize; |
45222
c525c7445e1b
(Vemulation_mode_map_alists): New variable.
Kim F. Storm <storm@cua.dk>
parents:
43504
diff
changeset
|
1428 Lisp_Object *newmodes, *newmaps; |
c525c7445e1b
(Vemulation_mode_map_alists): New variable.
Kim F. Storm <storm@cua.dk>
parents:
43504
diff
changeset
|
1429 |
45235
66271fa0bf60
(current_minor_maps): Fixed resizing of cmm_maps;
Kim F. Storm <storm@cua.dk>
parents:
45222
diff
changeset
|
1430 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
|
1431 allocsize = newsize * sizeof *newmodes; |
66271fa0bf60
(current_minor_maps): Fixed resizing of cmm_maps;
Kim F. Storm <storm@cua.dk>
parents:
45222
diff
changeset
|
1432 |
45619
dbd65bd8bb4f
(describe_command): Cast `current_column' return value to int.
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
45404
diff
changeset
|
1433 /* 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
|
1434 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
|
1435 BLOCK_INPUT; |
66271fa0bf60
(current_minor_maps): Fixed resizing of cmm_maps;
Kim F. Storm <storm@cua.dk>
parents:
45222
diff
changeset
|
1436 newmodes = (Lisp_Object *) malloc (allocsize); |
66271fa0bf60
(current_minor_maps): Fixed resizing of cmm_maps;
Kim F. Storm <storm@cua.dk>
parents:
45222
diff
changeset
|
1437 if (newmodes) |
45222
c525c7445e1b
(Vemulation_mode_map_alists): New variable.
Kim F. Storm <storm@cua.dk>
parents:
43504
diff
changeset
|
1438 { |
45235
66271fa0bf60
(current_minor_maps): Fixed resizing of cmm_maps;
Kim F. Storm <storm@cua.dk>
parents:
45222
diff
changeset
|
1439 if (cmm_modes) |
66271fa0bf60
(current_minor_maps): Fixed resizing of cmm_maps;
Kim F. Storm <storm@cua.dk>
parents:
45222
diff
changeset
|
1440 { |
66271fa0bf60
(current_minor_maps): Fixed resizing of cmm_maps;
Kim F. Storm <storm@cua.dk>
parents:
45222
diff
changeset
|
1441 bcopy (cmm_modes, newmodes, cmm_size * sizeof cmm_modes[0]); |
66271fa0bf60
(current_minor_maps): Fixed resizing of cmm_maps;
Kim F. Storm <storm@cua.dk>
parents:
45222
diff
changeset
|
1442 free (cmm_modes); |
66271fa0bf60
(current_minor_maps): Fixed resizing of cmm_maps;
Kim F. Storm <storm@cua.dk>
parents:
45222
diff
changeset
|
1443 } |
66271fa0bf60
(current_minor_maps): Fixed resizing of cmm_maps;
Kim F. Storm <storm@cua.dk>
parents:
45222
diff
changeset
|
1444 cmm_modes = newmodes; |
45222
c525c7445e1b
(Vemulation_mode_map_alists): New variable.
Kim F. Storm <storm@cua.dk>
parents:
43504
diff
changeset
|
1445 } |
45235
66271fa0bf60
(current_minor_maps): Fixed resizing of cmm_maps;
Kim F. Storm <storm@cua.dk>
parents:
45222
diff
changeset
|
1446 |
66271fa0bf60
(current_minor_maps): Fixed resizing of cmm_maps;
Kim F. Storm <storm@cua.dk>
parents:
45222
diff
changeset
|
1447 newmaps = (Lisp_Object *) malloc (allocsize); |
66271fa0bf60
(current_minor_maps): Fixed resizing of cmm_maps;
Kim F. Storm <storm@cua.dk>
parents:
45222
diff
changeset
|
1448 if (newmaps) |
45222
c525c7445e1b
(Vemulation_mode_map_alists): New variable.
Kim F. Storm <storm@cua.dk>
parents:
43504
diff
changeset
|
1449 { |
45235
66271fa0bf60
(current_minor_maps): Fixed resizing of cmm_maps;
Kim F. Storm <storm@cua.dk>
parents:
45222
diff
changeset
|
1450 if (cmm_maps) |
66271fa0bf60
(current_minor_maps): Fixed resizing of cmm_maps;
Kim F. Storm <storm@cua.dk>
parents:
45222
diff
changeset
|
1451 { |
66271fa0bf60
(current_minor_maps): Fixed resizing of cmm_maps;
Kim F. Storm <storm@cua.dk>
parents:
45222
diff
changeset
|
1452 bcopy (cmm_maps, newmaps, cmm_size * sizeof cmm_maps[0]); |
66271fa0bf60
(current_minor_maps): Fixed resizing of cmm_maps;
Kim F. Storm <storm@cua.dk>
parents:
45222
diff
changeset
|
1453 free (cmm_maps); |
66271fa0bf60
(current_minor_maps): Fixed resizing of cmm_maps;
Kim F. Storm <storm@cua.dk>
parents:
45222
diff
changeset
|
1454 } |
66271fa0bf60
(current_minor_maps): Fixed resizing of cmm_maps;
Kim F. Storm <storm@cua.dk>
parents:
45222
diff
changeset
|
1455 cmm_maps = newmaps; |
45222
c525c7445e1b
(Vemulation_mode_map_alists): New variable.
Kim F. Storm <storm@cua.dk>
parents:
43504
diff
changeset
|
1456 } |
45235
66271fa0bf60
(current_minor_maps): Fixed resizing of cmm_maps;
Kim F. Storm <storm@cua.dk>
parents:
45222
diff
changeset
|
1457 UNBLOCK_INPUT; |
45619
dbd65bd8bb4f
(describe_command): Cast `current_column' return value to int.
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
45404
diff
changeset
|
1458 |
45222
c525c7445e1b
(Vemulation_mode_map_alists): New variable.
Kim F. Storm <storm@cua.dk>
parents:
43504
diff
changeset
|
1459 if (newmodes == NULL || newmaps == NULL) |
c525c7445e1b
(Vemulation_mode_map_alists): New variable.
Kim F. Storm <storm@cua.dk>
parents:
43504
diff
changeset
|
1460 break; |
45235
66271fa0bf60
(current_minor_maps): Fixed resizing of cmm_maps;
Kim F. Storm <storm@cua.dk>
parents:
45222
diff
changeset
|
1461 cmm_size = newsize; |
45222
c525c7445e1b
(Vemulation_mode_map_alists): New variable.
Kim F. Storm <storm@cua.dk>
parents:
43504
diff
changeset
|
1462 } |
c525c7445e1b
(Vemulation_mode_map_alists): New variable.
Kim F. Storm <storm@cua.dk>
parents:
43504
diff
changeset
|
1463 |
c525c7445e1b
(Vemulation_mode_map_alists): New variable.
Kim F. Storm <storm@cua.dk>
parents:
43504
diff
changeset
|
1464 /* Get the keymap definition--or nil if it is not defined. */ |
c525c7445e1b
(Vemulation_mode_map_alists): New variable.
Kim F. Storm <storm@cua.dk>
parents:
43504
diff
changeset
|
1465 temp = internal_condition_case_1 (Findirect_function, |
c525c7445e1b
(Vemulation_mode_map_alists): New variable.
Kim F. Storm <storm@cua.dk>
parents:
43504
diff
changeset
|
1466 XCDR (assoc), |
c525c7445e1b
(Vemulation_mode_map_alists): New variable.
Kim F. Storm <storm@cua.dk>
parents:
43504
diff
changeset
|
1467 Qerror, current_minor_maps_error); |
c525c7445e1b
(Vemulation_mode_map_alists): New variable.
Kim F. Storm <storm@cua.dk>
parents:
43504
diff
changeset
|
1468 if (!NILP (temp)) |
c525c7445e1b
(Vemulation_mode_map_alists): New variable.
Kim F. Storm <storm@cua.dk>
parents:
43504
diff
changeset
|
1469 { |
c525c7445e1b
(Vemulation_mode_map_alists): New variable.
Kim F. Storm <storm@cua.dk>
parents:
43504
diff
changeset
|
1470 cmm_modes[i] = var; |
c525c7445e1b
(Vemulation_mode_map_alists): New variable.
Kim F. Storm <storm@cua.dk>
parents:
43504
diff
changeset
|
1471 cmm_maps [i] = temp; |
c525c7445e1b
(Vemulation_mode_map_alists): New variable.
Kim F. Storm <storm@cua.dk>
parents:
43504
diff
changeset
|
1472 i++; |
c525c7445e1b
(Vemulation_mode_map_alists): New variable.
Kim F. Storm <storm@cua.dk>
parents:
43504
diff
changeset
|
1473 } |
c525c7445e1b
(Vemulation_mode_map_alists): New variable.
Kim F. Storm <storm@cua.dk>
parents:
43504
diff
changeset
|
1474 } |
c525c7445e1b
(Vemulation_mode_map_alists): New variable.
Kim F. Storm <storm@cua.dk>
parents:
43504
diff
changeset
|
1475 } |
465 | 1476 |
485 | 1477 if (modeptr) *modeptr = cmm_modes; |
1478 if (mapptr) *mapptr = cmm_maps; | |
465 | 1479 return i; |
1480 } | |
1481 | |
39689
0572449a62be
(Fkeymap_prompt, Fcurrent_active_maps): New funs.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
39682
diff
changeset
|
1482 DEFUN ("current-active-maps", Fcurrent_active_maps, Scurrent_active_maps, |
41001
a17c8b15ef1b
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
40804
diff
changeset
|
1483 0, 1, 0, |
a17c8b15ef1b
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
40804
diff
changeset
|
1484 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
|
1485 OLP if non-nil indicates that we should obey `overriding-local-map' and |
a17c8b15ef1b
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
40804
diff
changeset
|
1486 `overriding-terminal-local-map'. */) |
39689
0572449a62be
(Fkeymap_prompt, Fcurrent_active_maps): New funs.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
39682
diff
changeset
|
1487 (olp) |
0572449a62be
(Fkeymap_prompt, Fcurrent_active_maps): New funs.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
39682
diff
changeset
|
1488 Lisp_Object olp; |
0572449a62be
(Fkeymap_prompt, Fcurrent_active_maps): New funs.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
39682
diff
changeset
|
1489 { |
0572449a62be
(Fkeymap_prompt, Fcurrent_active_maps): New funs.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
39682
diff
changeset
|
1490 Lisp_Object keymaps = Fcons (current_global_map, Qnil); |
0572449a62be
(Fkeymap_prompt, Fcurrent_active_maps): New funs.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
39682
diff
changeset
|
1491 |
0572449a62be
(Fkeymap_prompt, Fcurrent_active_maps): New funs.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
39682
diff
changeset
|
1492 if (!NILP (olp)) |
0572449a62be
(Fkeymap_prompt, Fcurrent_active_maps): New funs.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
39682
diff
changeset
|
1493 { |
0572449a62be
(Fkeymap_prompt, Fcurrent_active_maps): New funs.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
39682
diff
changeset
|
1494 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
|
1495 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
|
1496 /* 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
|
1497 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
|
1498 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
|
1499 else if (!NILP (Voverriding_local_map)) |
031c9a79c55a
(Fcurrent_active_maps): Ignore Voverriding_local_map
Richard M. Stallman <rms@gnu.org>
parents:
58450
diff
changeset
|
1500 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
|
1501 } |
0572449a62be
(Fkeymap_prompt, Fcurrent_active_maps): New funs.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
39682
diff
changeset
|
1502 if (NILP (XCDR (keymaps))) |
0572449a62be
(Fkeymap_prompt, Fcurrent_active_maps): New funs.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
39682
diff
changeset
|
1503 { |
0572449a62be
(Fkeymap_prompt, Fcurrent_active_maps): New funs.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
39682
diff
changeset
|
1504 Lisp_Object local; |
0572449a62be
(Fkeymap_prompt, Fcurrent_active_maps): New funs.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
39682
diff
changeset
|
1505 Lisp_Object *maps; |
0572449a62be
(Fkeymap_prompt, Fcurrent_active_maps): New funs.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
39682
diff
changeset
|
1506 int nmaps, i; |
0572449a62be
(Fkeymap_prompt, Fcurrent_active_maps): New funs.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
39682
diff
changeset
|
1507 |
59522
031c9a79c55a
(Fcurrent_active_maps): Ignore Voverriding_local_map
Richard M. Stallman <rms@gnu.org>
parents:
58450
diff
changeset
|
1508 /* This usually returns the buffer's local map, |
031c9a79c55a
(Fcurrent_active_maps): Ignore Voverriding_local_map
Richard M. Stallman <rms@gnu.org>
parents:
58450
diff
changeset
|
1509 but that can be overridden by a `local-map' property. */ |
39689
0572449a62be
(Fkeymap_prompt, Fcurrent_active_maps): New funs.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
39682
diff
changeset
|
1510 local = get_local_map (PT, current_buffer, Qlocal_map); |
0572449a62be
(Fkeymap_prompt, Fcurrent_active_maps): New funs.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
39682
diff
changeset
|
1511 if (!NILP (local)) |
0572449a62be
(Fkeymap_prompt, Fcurrent_active_maps): New funs.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
39682
diff
changeset
|
1512 keymaps = Fcons (local, keymaps); |
0572449a62be
(Fkeymap_prompt, Fcurrent_active_maps): New funs.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
39682
diff
changeset
|
1513 |
59522
031c9a79c55a
(Fcurrent_active_maps): Ignore Voverriding_local_map
Richard M. Stallman <rms@gnu.org>
parents:
58450
diff
changeset
|
1514 /* 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
|
1515 nmaps = current_minor_maps (0, &maps); |
0572449a62be
(Fkeymap_prompt, Fcurrent_active_maps): New funs.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
39682
diff
changeset
|
1516 |
0572449a62be
(Fkeymap_prompt, Fcurrent_active_maps): New funs.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
39682
diff
changeset
|
1517 for (i = --nmaps; i >= 0; i--) |
0572449a62be
(Fkeymap_prompt, Fcurrent_active_maps): New funs.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
39682
diff
changeset
|
1518 if (!NILP (maps[i])) |
0572449a62be
(Fkeymap_prompt, Fcurrent_active_maps): New funs.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
39682
diff
changeset
|
1519 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
|
1520 |
59522
031c9a79c55a
(Fcurrent_active_maps): Ignore Voverriding_local_map
Richard M. Stallman <rms@gnu.org>
parents:
58450
diff
changeset
|
1521 /* This returns nil unless there is a `keymap' property. */ |
42510
dde71e46eeeb
(Fcurrent_active_maps): Put the `keymap' property map first.
Richard M. Stallman <rms@gnu.org>
parents:
42404
diff
changeset
|
1522 local = get_local_map (PT, current_buffer, Qkeymap); |
dde71e46eeeb
(Fcurrent_active_maps): Put the `keymap' property map first.
Richard M. Stallman <rms@gnu.org>
parents:
42404
diff
changeset
|
1523 if (!NILP (local)) |
dde71e46eeeb
(Fcurrent_active_maps): Put the `keymap' property map first.
Richard M. Stallman <rms@gnu.org>
parents:
42404
diff
changeset
|
1524 keymaps = Fcons (local, keymaps); |
39689
0572449a62be
(Fkeymap_prompt, Fcurrent_active_maps): New funs.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
39682
diff
changeset
|
1525 } |
45279
220c13a65624
(keymap_parent): New fun, extracted from Fkeymap_parent.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
45235
diff
changeset
|
1526 |
39689
0572449a62be
(Fkeymap_prompt, Fcurrent_active_maps): New funs.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
39682
diff
changeset
|
1527 return keymaps; |
0572449a62be
(Fkeymap_prompt, Fcurrent_active_maps): New funs.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
39682
diff
changeset
|
1528 } |
0572449a62be
(Fkeymap_prompt, Fcurrent_active_maps): New funs.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
39682
diff
changeset
|
1529 |
7998
d4b5f4dd9c51
(Flookup_key): Add gcpro.
Richard M. Stallman <rms@gnu.org>
parents:
7894
diff
changeset
|
1530 /* 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
|
1531 |
43152
0029b0259426
(Fdefine_key): Allow symbol as KEY argument for
Kim F. Storm <storm@cua.dk>
parents:
42510
diff
changeset
|
1532 DEFUN ("key-binding", Fkey_binding, Skey_binding, 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
|
1533 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
|
1534 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
|
1535 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
|
1536 |
a17c8b15ef1b
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
40804
diff
changeset
|
1537 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
|
1538 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
|
1539 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
|
1540 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
|
1541 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
|
1542 |
0029b0259426
(Fdefine_key): Allow symbol as KEY argument for
Kim F. Storm <storm@cua.dk>
parents:
42510
diff
changeset
|
1543 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
|
1544 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
|
1545 current keymaps. However, if the optional third argument NO-REMAP |
43152
0029b0259426
(Fdefine_key): Allow symbol as KEY argument for
Kim F. Storm <storm@cua.dk>
parents:
42510
diff
changeset
|
1546 is non-nil, `key-binding' returns the unmapped command. */) |
0029b0259426
(Fdefine_key): Allow symbol as KEY argument for
Kim F. Storm <storm@cua.dk>
parents:
42510
diff
changeset
|
1547 (key, accept_default, no_remap) |
0029b0259426
(Fdefine_key): Allow symbol as KEY argument for
Kim F. Storm <storm@cua.dk>
parents:
42510
diff
changeset
|
1548 Lisp_Object key, accept_default, no_remap; |
250 | 1549 { |
465 | 1550 Lisp_Object *maps, value; |
1551 int nmaps, i; | |
7998
d4b5f4dd9c51
(Flookup_key): Add gcpro.
Richard M. Stallman <rms@gnu.org>
parents:
7894
diff
changeset
|
1552 struct gcpro gcpro1; |
d4b5f4dd9c51
(Flookup_key): Add gcpro.
Richard M. Stallman <rms@gnu.org>
parents:
7894
diff
changeset
|
1553 |
d4b5f4dd9c51
(Flookup_key): Add gcpro.
Richard M. Stallman <rms@gnu.org>
parents:
7894
diff
changeset
|
1554 GCPRO1 (key); |
465 | 1555 |
12262
a7d5578ebb25
(Fkey_binding, describe_buffer_bindings):
Karl Heuer <kwzh@gnu.org>
parents:
12151
diff
changeset
|
1556 if (!NILP (current_kboard->Voverriding_terminal_local_map)) |
a7d5578ebb25
(Fkey_binding, describe_buffer_bindings):
Karl Heuer <kwzh@gnu.org>
parents:
12151
diff
changeset
|
1557 { |
a7d5578ebb25
(Fkey_binding, describe_buffer_bindings):
Karl Heuer <kwzh@gnu.org>
parents:
12151
diff
changeset
|
1558 value = Flookup_key (current_kboard->Voverriding_terminal_local_map, |
a7d5578ebb25
(Fkey_binding, describe_buffer_bindings):
Karl Heuer <kwzh@gnu.org>
parents:
12151
diff
changeset
|
1559 key, accept_default); |
a7d5578ebb25
(Fkey_binding, describe_buffer_bindings):
Karl Heuer <kwzh@gnu.org>
parents:
12151
diff
changeset
|
1560 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
|
1561 goto done; |
12262
a7d5578ebb25
(Fkey_binding, describe_buffer_bindings):
Karl Heuer <kwzh@gnu.org>
parents:
12151
diff
changeset
|
1562 } |
a7d5578ebb25
(Fkey_binding, describe_buffer_bindings):
Karl Heuer <kwzh@gnu.org>
parents:
12151
diff
changeset
|
1563 else if (!NILP (Voverriding_local_map)) |
250 | 1564 { |
5613
cad51b2de6cd
(Fkey_binding): Handle Voverriding_local_map.
Richard M. Stallman <rms@gnu.org>
parents:
5551
diff
changeset
|
1565 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
|
1566 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
|
1567 goto done; |
250 | 1568 } |
5613
cad51b2de6cd
(Fkey_binding): Handle Voverriding_local_map.
Richard M. Stallman <rms@gnu.org>
parents:
5551
diff
changeset
|
1569 else |
45619
dbd65bd8bb4f
(describe_command): Cast `current_column' return value to int.
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
45404
diff
changeset
|
1570 { |
13771
28790743a5a3
(Fkey_binding): Handle text-property keymaps.
Karl Heuer <kwzh@gnu.org>
parents:
13343
diff
changeset
|
1571 Lisp_Object local; |
28790743a5a3
(Fkey_binding): Handle text-property keymaps.
Karl Heuer <kwzh@gnu.org>
parents:
13343
diff
changeset
|
1572 |
42510
dde71e46eeeb
(Fcurrent_active_maps): Put the `keymap' property map first.
Richard M. Stallman <rms@gnu.org>
parents:
42404
diff
changeset
|
1573 local = get_local_map (PT, current_buffer, Qkeymap); |
dde71e46eeeb
(Fcurrent_active_maps): Put the `keymap' property map first.
Richard M. Stallman <rms@gnu.org>
parents:
42404
diff
changeset
|
1574 if (! NILP (local)) |
dde71e46eeeb
(Fcurrent_active_maps): Put the `keymap' property map first.
Richard M. Stallman <rms@gnu.org>
parents:
42404
diff
changeset
|
1575 { |
dde71e46eeeb
(Fcurrent_active_maps): Put the `keymap' property map first.
Richard M. Stallman <rms@gnu.org>
parents:
42404
diff
changeset
|
1576 value = Flookup_key (local, key, accept_default); |
dde71e46eeeb
(Fcurrent_active_maps): Put the `keymap' property map first.
Richard M. Stallman <rms@gnu.org>
parents:
42404
diff
changeset
|
1577 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
|
1578 goto done; |
42510
dde71e46eeeb
(Fcurrent_active_maps): Put the `keymap' property map first.
Richard M. Stallman <rms@gnu.org>
parents:
42404
diff
changeset
|
1579 } |
dde71e46eeeb
(Fcurrent_active_maps): Put the `keymap' property map first.
Richard M. Stallman <rms@gnu.org>
parents:
42404
diff
changeset
|
1580 |
5613
cad51b2de6cd
(Fkey_binding): Handle Voverriding_local_map.
Richard M. Stallman <rms@gnu.org>
parents:
5551
diff
changeset
|
1581 nmaps = current_minor_maps (0, &maps); |
7998
d4b5f4dd9c51
(Flookup_key): Add gcpro.
Richard M. Stallman <rms@gnu.org>
parents:
7894
diff
changeset
|
1582 /* Note that all these maps are GCPRO'd |
d4b5f4dd9c51
(Flookup_key): Add gcpro.
Richard M. Stallman <rms@gnu.org>
parents:
7894
diff
changeset
|
1583 in the places where we found them. */ |
d4b5f4dd9c51
(Flookup_key): Add gcpro.
Richard M. Stallman <rms@gnu.org>
parents:
7894
diff
changeset
|
1584 |
5613
cad51b2de6cd
(Fkey_binding): Handle Voverriding_local_map.
Richard M. Stallman <rms@gnu.org>
parents:
5551
diff
changeset
|
1585 for (i = 0; i < nmaps; i++) |
cad51b2de6cd
(Fkey_binding): Handle Voverriding_local_map.
Richard M. Stallman <rms@gnu.org>
parents:
5551
diff
changeset
|
1586 if (! NILP (maps[i])) |
cad51b2de6cd
(Fkey_binding): Handle Voverriding_local_map.
Richard M. Stallman <rms@gnu.org>
parents:
5551
diff
changeset
|
1587 { |
cad51b2de6cd
(Fkey_binding): Handle Voverriding_local_map.
Richard M. Stallman <rms@gnu.org>
parents:
5551
diff
changeset
|
1588 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
|
1589 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
|
1590 goto done; |
5613
cad51b2de6cd
(Fkey_binding): Handle Voverriding_local_map.
Richard M. Stallman <rms@gnu.org>
parents:
5551
diff
changeset
|
1591 } |
cad51b2de6cd
(Fkey_binding): Handle Voverriding_local_map.
Richard M. Stallman <rms@gnu.org>
parents:
5551
diff
changeset
|
1592 |
35258
f585b46c055a
Call get_local_map with new argument list.
Gerd Moellmann <gerd@gnu.org>
parents:
34906
diff
changeset
|
1593 local = get_local_map (PT, current_buffer, Qlocal_map); |
13771
28790743a5a3
(Fkey_binding): Handle text-property keymaps.
Karl Heuer <kwzh@gnu.org>
parents:
13343
diff
changeset
|
1594 if (! NILP (local)) |
5613
cad51b2de6cd
(Fkey_binding): Handle Voverriding_local_map.
Richard M. Stallman <rms@gnu.org>
parents:
5551
diff
changeset
|
1595 { |
13771
28790743a5a3
(Fkey_binding): Handle text-property keymaps.
Karl Heuer <kwzh@gnu.org>
parents:
13343
diff
changeset
|
1596 value = Flookup_key (local, 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
|
1597 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
|
1598 goto done; |
5613
cad51b2de6cd
(Fkey_binding): Handle Voverriding_local_map.
Richard M. Stallman <rms@gnu.org>
parents:
5551
diff
changeset
|
1599 } |
cad51b2de6cd
(Fkey_binding): Handle Voverriding_local_map.
Richard M. Stallman <rms@gnu.org>
parents:
5551
diff
changeset
|
1600 } |
465 | 1601 |
1871
00bee181f7ed
* keymap.c (Flookup_key, Fkey_binding, Flocal_key_binding,
Jim Blandy <jimb@redhat.com>
parents:
1821
diff
changeset
|
1602 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
|
1603 |
0029b0259426
(Fdefine_key): Allow symbol as KEY argument for
Kim F. Storm <storm@cua.dk>
parents:
42510
diff
changeset
|
1604 done: |
7998
d4b5f4dd9c51
(Flookup_key): Add gcpro.
Richard M. Stallman <rms@gnu.org>
parents:
7894
diff
changeset
|
1605 UNGCPRO; |
43152
0029b0259426
(Fdefine_key): Allow symbol as KEY argument for
Kim F. Storm <storm@cua.dk>
parents:
42510
diff
changeset
|
1606 if (NILP (value) || INTEGERP (value)) |
0029b0259426
(Fdefine_key): Allow symbol as KEY argument for
Kim F. Storm <storm@cua.dk>
parents:
42510
diff
changeset
|
1607 return Qnil; |
0029b0259426
(Fdefine_key): Allow symbol as KEY argument for
Kim F. Storm <storm@cua.dk>
parents:
42510
diff
changeset
|
1608 |
0029b0259426
(Fdefine_key): Allow symbol as KEY argument for
Kim F. Storm <storm@cua.dk>
parents:
42510
diff
changeset
|
1609 /* 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
|
1610 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
|
1611 |
43494
b5b76b498398
The following changes rework my patch of 2002-02-06 which
Kim F. Storm <storm@cua.dk>
parents:
43164
diff
changeset
|
1612 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
|
1613 { |
0029b0259426
(Fdefine_key): Allow symbol as KEY argument for
Kim F. Storm <storm@cua.dk>
parents:
42510
diff
changeset
|
1614 Lisp_Object value1; |
49757
9fe119b14379
Renamed remap-command to command-remapping. All uses changed.
Kim F. Storm <storm@cua.dk>
parents:
49720
diff
changeset
|
1615 if (value1 = Fcommand_remapping (value), !NILP (value1)) |
43152
0029b0259426
(Fdefine_key): Allow symbol as KEY argument for
Kim F. Storm <storm@cua.dk>
parents:
42510
diff
changeset
|
1616 value = value1; |
0029b0259426
(Fdefine_key): Allow symbol as KEY argument for
Kim F. Storm <storm@cua.dk>
parents:
42510
diff
changeset
|
1617 } |
45619
dbd65bd8bb4f
(describe_command): Cast `current_column' return value to int.
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
45404
diff
changeset
|
1618 |
43152
0029b0259426
(Fdefine_key): Allow symbol as KEY argument for
Kim F. Storm <storm@cua.dk>
parents:
42510
diff
changeset
|
1619 return value; |
250 | 1620 } |
1621 | |
7998
d4b5f4dd9c51
(Flookup_key): Add gcpro.
Richard M. Stallman <rms@gnu.org>
parents:
7894
diff
changeset
|
1622 /* 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
|
1623 |
1871
00bee181f7ed
* keymap.c (Flookup_key, Fkey_binding, Flocal_key_binding,
Jim Blandy <jimb@redhat.com>
parents:
1821
diff
changeset
|
1624 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
|
1625 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
|
1626 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
|
1627 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
|
1628 |
a17c8b15ef1b
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
40804
diff
changeset
|
1629 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
|
1630 bindings; see the description of `lookup-key' for more details about this. */) |
a17c8b15ef1b
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
40804
diff
changeset
|
1631 (keys, accept_default) |
1871
00bee181f7ed
* keymap.c (Flookup_key, Fkey_binding, Flocal_key_binding,
Jim Blandy <jimb@redhat.com>
parents:
1821
diff
changeset
|
1632 Lisp_Object keys, accept_default; |
250 | 1633 { |
1634 register Lisp_Object map; | |
1635 map = current_buffer->keymap; | |
485 | 1636 if (NILP (map)) |
250 | 1637 return Qnil; |
1871
00bee181f7ed
* keymap.c (Flookup_key, Fkey_binding, Flocal_key_binding,
Jim Blandy <jimb@redhat.com>
parents:
1821
diff
changeset
|
1638 return Flookup_key (map, keys, accept_default); |
250 | 1639 } |
1640 | |
7998
d4b5f4dd9c51
(Flookup_key): Add gcpro.
Richard M. Stallman <rms@gnu.org>
parents:
7894
diff
changeset
|
1641 /* 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
|
1642 |
1871
00bee181f7ed
* keymap.c (Flookup_key, Fkey_binding, Flocal_key_binding,
Jim Blandy <jimb@redhat.com>
parents:
1821
diff
changeset
|
1643 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
|
1644 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
|
1645 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
|
1646 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
|
1647 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
|
1648 \(which see). |
a17c8b15ef1b
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
40804
diff
changeset
|
1649 |
a17c8b15ef1b
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
40804
diff
changeset
|
1650 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
|
1651 bindings; see the description of `lookup-key' for more details about this. */) |
a17c8b15ef1b
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
40804
diff
changeset
|
1652 (keys, accept_default) |
1871
00bee181f7ed
* keymap.c (Flookup_key, Fkey_binding, Flocal_key_binding,
Jim Blandy <jimb@redhat.com>
parents:
1821
diff
changeset
|
1653 Lisp_Object keys, accept_default; |
250 | 1654 { |
1871
00bee181f7ed
* keymap.c (Flookup_key, Fkey_binding, Flocal_key_binding,
Jim Blandy <jimb@redhat.com>
parents:
1821
diff
changeset
|
1655 return Flookup_key (current_global_map, keys, accept_default); |
250 | 1656 } |
1657 | |
7998
d4b5f4dd9c51
(Flookup_key): Add gcpro.
Richard M. Stallman <rms@gnu.org>
parents:
7894
diff
changeset
|
1658 /* 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
|
1659 |
1871
00bee181f7ed
* keymap.c (Flookup_key, Fkey_binding, Flocal_key_binding,
Jim Blandy <jimb@redhat.com>
parents:
1821
diff
changeset
|
1660 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
|
1661 doc: /* Find the visible minor mode bindings of KEY. |
a17c8b15ef1b
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
40804
diff
changeset
|
1662 Return an alist of pairs (MODENAME . BINDING), where MODENAME is the |
a17c8b15ef1b
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
40804
diff
changeset
|
1663 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
|
1664 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
|
1665 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
|
1666 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
|
1667 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
|
1668 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
|
1669 |
a17c8b15ef1b
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
40804
diff
changeset
|
1670 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
|
1671 bindings; see the description of `lookup-key' for more details about this. */) |
a17c8b15ef1b
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
40804
diff
changeset
|
1672 (key, accept_default) |
1871
00bee181f7ed
* keymap.c (Flookup_key, Fkey_binding, Flocal_key_binding,
Jim Blandy <jimb@redhat.com>
parents:
1821
diff
changeset
|
1673 Lisp_Object key, accept_default; |
465 | 1674 { |
1675 Lisp_Object *modes, *maps; | |
1676 int nmaps; | |
1677 Lisp_Object binding; | |
1678 int i, j; | |
7998
d4b5f4dd9c51
(Flookup_key): Add gcpro.
Richard M. Stallman <rms@gnu.org>
parents:
7894
diff
changeset
|
1679 struct gcpro gcpro1, gcpro2; |
465 | 1680 |
1681 nmaps = current_minor_maps (&modes, &maps); | |
7998
d4b5f4dd9c51
(Flookup_key): Add gcpro.
Richard M. Stallman <rms@gnu.org>
parents:
7894
diff
changeset
|
1682 /* Note that all these maps are GCPRO'd |
d4b5f4dd9c51
(Flookup_key): Add gcpro.
Richard M. Stallman <rms@gnu.org>
parents:
7894
diff
changeset
|
1683 in the places where we found them. */ |
d4b5f4dd9c51
(Flookup_key): Add gcpro.
Richard M. Stallman <rms@gnu.org>
parents:
7894
diff
changeset
|
1684 |
d4b5f4dd9c51
(Flookup_key): Add gcpro.
Richard M. Stallman <rms@gnu.org>
parents:
7894
diff
changeset
|
1685 binding = Qnil; |
d4b5f4dd9c51
(Flookup_key): Add gcpro.
Richard M. Stallman <rms@gnu.org>
parents:
7894
diff
changeset
|
1686 GCPRO2 (key, binding); |
465 | 1687 |
1688 for (i = j = 0; i < nmaps; i++) | |
32988
c3435dc00ed7
* lisp.h (KEYMAPP): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
32889
diff
changeset
|
1689 if (!NILP (maps[i]) |
c3435dc00ed7
* lisp.h (KEYMAPP): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
32889
diff
changeset
|
1690 && !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
|
1691 && !INTEGERP (binding)) |
465 | 1692 { |
32988
c3435dc00ed7
* lisp.h (KEYMAPP): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
32889
diff
changeset
|
1693 if (KEYMAPP (binding)) |
465 | 1694 maps[j++] = Fcons (modes[i], binding); |
1695 else if (j == 0) | |
7998
d4b5f4dd9c51
(Flookup_key): Add gcpro.
Richard M. Stallman <rms@gnu.org>
parents:
7894
diff
changeset
|
1696 RETURN_UNGCPRO (Fcons (Fcons (modes[i], binding), Qnil)); |
465 | 1697 } |
1698 | |
7998
d4b5f4dd9c51
(Flookup_key): Add gcpro.
Richard M. Stallman <rms@gnu.org>
parents:
7894
diff
changeset
|
1699 UNGCPRO; |
465 | 1700 return Flist (j, maps); |
1701 } | |
1702 | |
23968
4c423f69142b
(Fdefine_prefix_command): Accept a third argument NAME
Eli Zaretskii <eliz@gnu.org>
parents:
23953
diff
changeset
|
1703 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
|
1704 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
|
1705 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
|
1706 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
|
1707 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
|
1708 as a function. |
a17c8b15ef1b
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
40804
diff
changeset
|
1709 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
|
1710 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
|
1711 This function returns COMMAND. */) |
41001
a17c8b15ef1b
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
40804
diff
changeset
|
1712 (command, mapvar, name) |
23968
4c423f69142b
(Fdefine_prefix_command): Accept a third argument NAME
Eli Zaretskii <eliz@gnu.org>
parents:
23953
diff
changeset
|
1713 Lisp_Object command, mapvar, name; |
250 | 1714 { |
1715 Lisp_Object map; | |
23968
4c423f69142b
(Fdefine_prefix_command): Accept a third argument NAME
Eli Zaretskii <eliz@gnu.org>
parents:
23953
diff
changeset
|
1716 map = Fmake_sparse_keymap (name); |
14080
439185f0ef37
(Fkeymapp, Fdefine_prefix_command, Faccessible_keymaps,
Erik Naggum <erik@naggum.no>
parents:
13947
diff
changeset
|
1717 Ffset (command, map); |
485 | 1718 if (!NILP (mapvar)) |
250 | 1719 Fset (mapvar, map); |
1720 else | |
14080
439185f0ef37
(Fkeymapp, Fdefine_prefix_command, Faccessible_keymaps,
Erik Naggum <erik@naggum.no>
parents:
13947
diff
changeset
|
1721 Fset (command, map); |
439185f0ef37
(Fkeymapp, Fdefine_prefix_command, Faccessible_keymaps,
Erik Naggum <erik@naggum.no>
parents:
13947
diff
changeset
|
1722 return command; |
250 | 1723 } |
1724 | |
1725 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
|
1726 doc: /* Select KEYMAP as the global keymap. */) |
a17c8b15ef1b
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
40804
diff
changeset
|
1727 (keymap) |
250 | 1728 Lisp_Object keymap; |
1729 { | |
32988
c3435dc00ed7
* lisp.h (KEYMAPP): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
32889
diff
changeset
|
1730 keymap = get_keymap (keymap, 1, 1); |
250 | 1731 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
|
1732 |
250 | 1733 return Qnil; |
1734 } | |
1735 | |
1736 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
|
1737 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
|
1738 If KEYMAP is nil, that means no local keymap. */) |
a17c8b15ef1b
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
40804
diff
changeset
|
1739 (keymap) |
250 | 1740 Lisp_Object keymap; |
1741 { | |
485 | 1742 if (!NILP (keymap)) |
32988
c3435dc00ed7
* lisp.h (KEYMAPP): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
32889
diff
changeset
|
1743 keymap = get_keymap (keymap, 1, 1); |
250 | 1744 |
1745 current_buffer->keymap = keymap; | |
1746 | |
1747 return Qnil; | |
1748 } | |
1749 | |
1750 DEFUN ("current-local-map", Fcurrent_local_map, Scurrent_local_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
|
1751 doc: /* Return current buffer's local keymap, or nil if it has none. */) |
a17c8b15ef1b
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
40804
diff
changeset
|
1752 () |
250 | 1753 { |
1754 return current_buffer->keymap; | |
1755 } | |
1756 | |
1757 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
|
1758 doc: /* Return the current global keymap. */) |
a17c8b15ef1b
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
40804
diff
changeset
|
1759 () |
250 | 1760 { |
1761 return current_global_map; | |
1762 } | |
465 | 1763 |
1764 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
|
1765 doc: /* Return a list of keymaps for the minor modes of the current buffer. */) |
a17c8b15ef1b
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
40804
diff
changeset
|
1766 () |
465 | 1767 { |
1768 Lisp_Object *maps; | |
1769 int nmaps = current_minor_maps (0, &maps); | |
1770 | |
1771 return Flist (nmaps, maps); | |
1772 } | |
250 | 1773 |
465 | 1774 /* Help functions for describing and documenting keymaps. */ |
1775 | |
39689
0572449a62be
(Fkeymap_prompt, Fcurrent_active_maps): New funs.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
39682
diff
changeset
|
1776 |
0572449a62be
(Fkeymap_prompt, Fcurrent_active_maps): New funs.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
39682
diff
changeset
|
1777 static void |
0572449a62be
(Fkeymap_prompt, Fcurrent_active_maps): New funs.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
39682
diff
changeset
|
1778 accessible_keymaps_1 (key, cmd, maps, tail, thisseq, is_metized) |
0572449a62be
(Fkeymap_prompt, Fcurrent_active_maps): New funs.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
39682
diff
changeset
|
1779 Lisp_Object maps, tail, thisseq, key, cmd; |
0572449a62be
(Fkeymap_prompt, Fcurrent_active_maps): New funs.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
39682
diff
changeset
|
1780 int is_metized; /* If 1, `key' is assumed to be INTEGERP. */ |
0572449a62be
(Fkeymap_prompt, Fcurrent_active_maps): New funs.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
39682
diff
changeset
|
1781 { |
0572449a62be
(Fkeymap_prompt, Fcurrent_active_maps): New funs.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
39682
diff
changeset
|
1782 Lisp_Object tem; |
0572449a62be
(Fkeymap_prompt, Fcurrent_active_maps): New funs.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
39682
diff
changeset
|
1783 |
50189
c7ce12a3b9c2
(accessible_keymaps_1): Break cycles but without preventing
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
50141
diff
changeset
|
1784 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
|
1785 if (NILP (cmd)) |
0572449a62be
(Fkeymap_prompt, Fcurrent_active_maps): New funs.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
39682
diff
changeset
|
1786 return; |
0572449a62be
(Fkeymap_prompt, Fcurrent_active_maps): New funs.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
39682
diff
changeset
|
1787 |
50189
c7ce12a3b9c2
(accessible_keymaps_1): Break cycles but without preventing
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
50141
diff
changeset
|
1788 /* Look for and break cycles. */ |
c7ce12a3b9c2
(accessible_keymaps_1): Break cycles but without preventing
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
50141
diff
changeset
|
1789 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
|
1790 { |
50189
c7ce12a3b9c2
(accessible_keymaps_1): Break cycles but without preventing
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
50141
diff
changeset
|
1791 Lisp_Object prefix = XCAR (tem); |
c7ce12a3b9c2
(accessible_keymaps_1): Break cycles but without preventing
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
50141
diff
changeset
|
1792 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
|
1793 if (lim <= XINT (Flength (thisseq))) |
c7ce12a3b9c2
(accessible_keymaps_1): Break cycles but without preventing
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
50141
diff
changeset
|
1794 { /* 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
|
1795 int i = 0; |
c7ce12a3b9c2
(accessible_keymaps_1): Break cycles but without preventing
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
50141
diff
changeset
|
1796 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
|
1797 Faref (thisseq, make_number (i)))) |
c7ce12a3b9c2
(accessible_keymaps_1): Break cycles but without preventing
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
50141
diff
changeset
|
1798 i++; |
c7ce12a3b9c2
(accessible_keymaps_1): Break cycles but without preventing
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
50141
diff
changeset
|
1799 if (i >= lim) |
c7ce12a3b9c2
(accessible_keymaps_1): Break cycles but without preventing
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
50141
diff
changeset
|
1800 /* `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
|
1801 return; |
39689
0572449a62be
(Fkeymap_prompt, Fcurrent_active_maps): New funs.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
39682
diff
changeset
|
1802 } |
50189
c7ce12a3b9c2
(accessible_keymaps_1): Break cycles but without preventing
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
50141
diff
changeset
|
1803 /* 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
|
1804 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
|
1805 looking. */ |
c7ce12a3b9c2
(accessible_keymaps_1): Break cycles but without preventing
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
50141
diff
changeset
|
1806 maps = XCDR (Fmemq (tem, maps)); |
c7ce12a3b9c2
(accessible_keymaps_1): Break cycles but without preventing
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
50141
diff
changeset
|
1807 } |
c7ce12a3b9c2
(accessible_keymaps_1): Break cycles but without preventing
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
50141
diff
changeset
|
1808 |
c7ce12a3b9c2
(accessible_keymaps_1): Break cycles but without preventing
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
50141
diff
changeset
|
1809 /* 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
|
1810 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
|
1811 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
|
1812 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
|
1813 keymap table. */ |
c7ce12a3b9c2
(accessible_keymaps_1): Break cycles but without preventing
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
50141
diff
changeset
|
1814 if (is_metized) |
c7ce12a3b9c2
(accessible_keymaps_1): Break cycles but without preventing
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
50141
diff
changeset
|
1815 { |
c7ce12a3b9c2
(accessible_keymaps_1): Break cycles but without preventing
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
50141
diff
changeset
|
1816 int meta_bit = meta_modifier; |
c7ce12a3b9c2
(accessible_keymaps_1): Break cycles but without preventing
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
50141
diff
changeset
|
1817 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
|
1818 tem = Fcopy_sequence (thisseq); |
54925
f0a7441d22f6
(Fkey_description): Add optional PREFIX arg.
Kim F. Storm <storm@cua.dk>
parents:
53808
diff
changeset
|
1819 |
50189
c7ce12a3b9c2
(accessible_keymaps_1): Break cycles but without preventing
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
50141
diff
changeset
|
1820 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
|
1821 |
50189
c7ce12a3b9c2
(accessible_keymaps_1): Break cycles but without preventing
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
50141
diff
changeset
|
1822 /* 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
|
1823 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
|
1824 after this one. */ |
c7ce12a3b9c2
(accessible_keymaps_1): Break cycles but without preventing
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
50141
diff
changeset
|
1825 XSETCDR (tail, |
c7ce12a3b9c2
(accessible_keymaps_1): Break cycles but without preventing
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
50141
diff
changeset
|
1826 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
|
1827 } |
c7ce12a3b9c2
(accessible_keymaps_1): Break cycles but without preventing
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
50141
diff
changeset
|
1828 else |
c7ce12a3b9c2
(accessible_keymaps_1): Break cycles but without preventing
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
50141
diff
changeset
|
1829 { |
c7ce12a3b9c2
(accessible_keymaps_1): Break cycles but without preventing
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
50141
diff
changeset
|
1830 tem = append_key (thisseq, key); |
c7ce12a3b9c2
(accessible_keymaps_1): Break cycles but without preventing
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
50141
diff
changeset
|
1831 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
|
1832 } |
0572449a62be
(Fkeymap_prompt, Fcurrent_active_maps): New funs.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
39682
diff
changeset
|
1833 } |
0572449a62be
(Fkeymap_prompt, Fcurrent_active_maps): New funs.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
39682
diff
changeset
|
1834 |
0572449a62be
(Fkeymap_prompt, Fcurrent_active_maps): New funs.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
39682
diff
changeset
|
1835 static void |
0572449a62be
(Fkeymap_prompt, Fcurrent_active_maps): New funs.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
39682
diff
changeset
|
1836 accessible_keymaps_char_table (args, index, cmd) |
0572449a62be
(Fkeymap_prompt, Fcurrent_active_maps): New funs.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
39682
diff
changeset
|
1837 Lisp_Object args, index, cmd; |
0572449a62be
(Fkeymap_prompt, Fcurrent_active_maps): New funs.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
39682
diff
changeset
|
1838 { |
0572449a62be
(Fkeymap_prompt, Fcurrent_active_maps): New funs.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
39682
diff
changeset
|
1839 accessible_keymaps_1 (index, cmd, |
0572449a62be
(Fkeymap_prompt, Fcurrent_active_maps): New funs.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
39682
diff
changeset
|
1840 XCAR (XCAR (args)), |
0572449a62be
(Fkeymap_prompt, Fcurrent_active_maps): New funs.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
39682
diff
changeset
|
1841 XCAR (XCDR (args)), |
0572449a62be
(Fkeymap_prompt, Fcurrent_active_maps): New funs.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
39682
diff
changeset
|
1842 XCDR (XCDR (args)), |
0572449a62be
(Fkeymap_prompt, Fcurrent_active_maps): New funs.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
39682
diff
changeset
|
1843 XINT (XCDR (XCAR (args)))); |
0572449a62be
(Fkeymap_prompt, Fcurrent_active_maps): New funs.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
39682
diff
changeset
|
1844 } |
17788
208d71ea3a4f
(get_keyelt): Handle an indirect entry with meta char.
Richard M. Stallman <rms@gnu.org>
parents:
17511
diff
changeset
|
1845 |
7998
d4b5f4dd9c51
(Flookup_key): Add gcpro.
Richard M. Stallman <rms@gnu.org>
parents:
7894
diff
changeset
|
1846 /* This function cannot GC. */ |
d4b5f4dd9c51
(Flookup_key): Add gcpro.
Richard M. Stallman <rms@gnu.org>
parents:
7894
diff
changeset
|
1847 |
250 | 1848 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
|
1849 1, 2, 0, |
a17c8b15ef1b
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
40804
diff
changeset
|
1850 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
|
1851 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
|
1852 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
|
1853 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
|
1854 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
|
1855 then the value includes only maps for prefixes that start with PREFIX. */) |
a17c8b15ef1b
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
40804
diff
changeset
|
1856 (keymap, prefix) |
14080
439185f0ef37
(Fkeymapp, Fdefine_prefix_command, Faccessible_keymaps,
Erik Naggum <erik@naggum.no>
parents:
13947
diff
changeset
|
1857 Lisp_Object keymap, prefix; |
250 | 1858 { |
50190
615d7388f725
(Faccessible_keymaps): Remove unused var.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
50189
diff
changeset
|
1859 Lisp_Object maps, tail; |
3952
f9dfc2872fb0
(describe_map_tree): Insert key_heading here.
Richard M. Stallman <rms@gnu.org>
parents:
3908
diff
changeset
|
1860 int prefixlen = 0; |
f9dfc2872fb0
(describe_map_tree): Insert key_heading here.
Richard M. Stallman <rms@gnu.org>
parents:
3908
diff
changeset
|
1861 |
7998
d4b5f4dd9c51
(Flookup_key): Add gcpro.
Richard M. Stallman <rms@gnu.org>
parents:
7894
diff
changeset
|
1862 /* 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
|
1863 |
3952
f9dfc2872fb0
(describe_map_tree): Insert key_heading here.
Richard M. Stallman <rms@gnu.org>
parents:
3908
diff
changeset
|
1864 if (!NILP (prefix)) |
f9dfc2872fb0
(describe_map_tree): Insert key_heading here.
Richard M. Stallman <rms@gnu.org>
parents:
3908
diff
changeset
|
1865 prefixlen = XINT (Flength (prefix)); |
250 | 1866 |
8431
b4138573c00f
(Faccessible_keymaps): Use PREFIX to set loop starting
Richard M. Stallman <rms@gnu.org>
parents:
7998
diff
changeset
|
1867 if (!NILP (prefix)) |
b4138573c00f
(Faccessible_keymaps): Use PREFIX to set loop starting
Richard M. Stallman <rms@gnu.org>
parents:
7998
diff
changeset
|
1868 { |
b4138573c00f
(Faccessible_keymaps): Use PREFIX to set loop starting
Richard M. Stallman <rms@gnu.org>
parents:
7998
diff
changeset
|
1869 /* 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
|
1870 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
|
1871 Lisp_Object tem; |
14080
439185f0ef37
(Fkeymapp, Fdefine_prefix_command, Faccessible_keymaps,
Erik Naggum <erik@naggum.no>
parents:
13947
diff
changeset
|
1872 tem = Flookup_key (keymap, prefix, Qt); |
8473
c285c3b0ea54
(Faccessible_keymaps): Fix previous change.
Richard M. Stallman <rms@gnu.org>
parents:
8464
diff
changeset
|
1873 /* 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
|
1874 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
|
1875 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
|
1876 tem = get_keymap (tem, 0, 0); |
c3435dc00ed7
* lisp.h (KEYMAPP): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
32889
diff
changeset
|
1877 if (CONSP (tem)) |
17510
2da99276d613
(Faccessible_keymaps): Convert PREFIX to a vector
Richard M. Stallman <rms@gnu.org>
parents:
17327
diff
changeset
|
1878 { |
2da99276d613
(Faccessible_keymaps): Convert PREFIX to a vector
Richard M. Stallman <rms@gnu.org>
parents:
17327
diff
changeset
|
1879 /* 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
|
1880 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
|
1881 if (STRINGP (prefix)) |
2da99276d613
(Faccessible_keymaps): Convert PREFIX to a vector
Richard M. Stallman <rms@gnu.org>
parents:
17327
diff
changeset
|
1882 { |
20624
9ac0b485cf60
(describe_vector): Unconditionally handle multibyte chars.
Richard M. Stallman <rms@gnu.org>
parents:
20576
diff
changeset
|
1883 int i, i_byte, c; |
17510
2da99276d613
(Faccessible_keymaps): Convert PREFIX to a vector
Richard M. Stallman <rms@gnu.org>
parents:
17327
diff
changeset
|
1884 Lisp_Object copy; |
2da99276d613
(Faccessible_keymaps): Convert PREFIX to a vector
Richard M. Stallman <rms@gnu.org>
parents:
17327
diff
changeset
|
1885 |
46370
40db0673e6f0
Most uses of XSTRING combined with STRING_BYTES or indirection changed to
Ken Raeburn <raeburn@raeburn.org>
parents:
46310
diff
changeset
|
1886 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
|
1887 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
|
1888 { |
20624
9ac0b485cf60
(describe_vector): Unconditionally handle multibyte chars.
Richard M. Stallman <rms@gnu.org>
parents:
20576
diff
changeset
|
1889 int i_before = i; |
29013
b9565b4bcdf8
(Fsingle_key_description): Use SPLIT_CHAR instead of
Kenichi Handa <handa@m17n.org>
parents:
26864
diff
changeset
|
1890 |
b9565b4bcdf8
(Fsingle_key_description): Use SPLIT_CHAR instead of
Kenichi Handa <handa@m17n.org>
parents:
26864
diff
changeset
|
1891 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
|
1892 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
|
1893 c ^= 0200 | meta_modifier; |
32846
c1b3ab2a1ccc
Use AREF, ASET and ASIZE macros.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
32844
diff
changeset
|
1894 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
|
1895 } |
2da99276d613
(Faccessible_keymaps): Convert PREFIX to a vector
Richard M. Stallman <rms@gnu.org>
parents:
17327
diff
changeset
|
1896 prefix = copy; |
2da99276d613
(Faccessible_keymaps): Convert PREFIX to a vector
Richard M. Stallman <rms@gnu.org>
parents:
17327
diff
changeset
|
1897 } |
2da99276d613
(Faccessible_keymaps): Convert PREFIX to a vector
Richard M. Stallman <rms@gnu.org>
parents:
17327
diff
changeset
|
1898 maps = Fcons (Fcons (prefix, tem), Qnil); |
2da99276d613
(Faccessible_keymaps): Convert PREFIX to a vector
Richard M. Stallman <rms@gnu.org>
parents:
17327
diff
changeset
|
1899 } |
8431
b4138573c00f
(Faccessible_keymaps): Use PREFIX to set loop starting
Richard M. Stallman <rms@gnu.org>
parents:
7998
diff
changeset
|
1900 else |
b4138573c00f
(Faccessible_keymaps): Use PREFIX to set loop starting
Richard M. Stallman <rms@gnu.org>
parents:
7998
diff
changeset
|
1901 return Qnil; |
b4138573c00f
(Faccessible_keymaps): Use PREFIX to set loop starting
Richard M. Stallman <rms@gnu.org>
parents:
7998
diff
changeset
|
1902 } |
b4138573c00f
(Faccessible_keymaps): Use PREFIX to set loop starting
Richard M. Stallman <rms@gnu.org>
parents:
7998
diff
changeset
|
1903 else |
b4138573c00f
(Faccessible_keymaps): Use PREFIX to set loop starting
Richard M. Stallman <rms@gnu.org>
parents:
7998
diff
changeset
|
1904 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
|
1905 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
|
1906 Qnil); |
250 | 1907 |
1908 /* For each map in the list maps, | |
1909 look at any other maps it points to, | |
1910 and stick them at the end if they are not already in the list. | |
1911 | |
1912 This is a breadth-first traversal, where tail is the queue of | |
1913 nodes, and maps accumulates a list of all nodes visited. */ | |
1914 | |
25662
0a7261c1d487
Use XCAR, XCDR, and XFLOAT_DATA instead of explicit member access.
Ken Raeburn <raeburn@raeburn.org>
parents:
25600
diff
changeset
|
1915 for (tail = maps; CONSP (tail); tail = XCDR (tail)) |
250 | 1916 { |
6502
18dfda644bc0
(access_keymap, store_in_keymap, Fcopy_keymap, Fdefine_key,
Karl Heuer <kwzh@gnu.org>
parents:
6475
diff
changeset
|
1917 register Lisp_Object thisseq, thismap; |
18dfda644bc0
(access_keymap, store_in_keymap, Fcopy_keymap, Fdefine_key,
Karl Heuer <kwzh@gnu.org>
parents:
6475
diff
changeset
|
1918 Lisp_Object last; |
18dfda644bc0
(access_keymap, store_in_keymap, Fcopy_keymap, Fdefine_key,
Karl Heuer <kwzh@gnu.org>
parents:
6475
diff
changeset
|
1919 /* Does the current sequence end in the meta-prefix-char? */ |
18dfda644bc0
(access_keymap, store_in_keymap, Fcopy_keymap, Fdefine_key,
Karl Heuer <kwzh@gnu.org>
parents:
6475
diff
changeset
|
1920 int is_metized; |
250 | 1921 |
6502
18dfda644bc0
(access_keymap, store_in_keymap, Fcopy_keymap, Fdefine_key,
Karl Heuer <kwzh@gnu.org>
parents:
6475
diff
changeset
|
1922 thisseq = Fcar (Fcar (tail)); |
18dfda644bc0
(access_keymap, store_in_keymap, Fcopy_keymap, Fdefine_key,
Karl Heuer <kwzh@gnu.org>
parents:
6475
diff
changeset
|
1923 thismap = Fcdr (Fcar (tail)); |
18dfda644bc0
(access_keymap, store_in_keymap, Fcopy_keymap, Fdefine_key,
Karl Heuer <kwzh@gnu.org>
parents:
6475
diff
changeset
|
1924 last = make_number (XINT (Flength (thisseq)) - 1); |
18dfda644bc0
(access_keymap, store_in_keymap, Fcopy_keymap, Fdefine_key,
Karl Heuer <kwzh@gnu.org>
parents:
6475
diff
changeset
|
1925 is_metized = (XINT (last) >= 0 |
17264
fad065a280dc
(Faccessible_keymaps): When metizing, convert a
Richard M. Stallman <rms@gnu.org>
parents:
17189
diff
changeset
|
1926 /* 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
|
1927 && XINT (last) >= prefixlen |
6502
18dfda644bc0
(access_keymap, store_in_keymap, Fcopy_keymap, Fdefine_key,
Karl Heuer <kwzh@gnu.org>
parents:
6475
diff
changeset
|
1928 && EQ (Faref (thisseq, last), meta_prefix_char)); |
250 | 1929 |
25662
0a7261c1d487
Use XCAR, XCDR, and XFLOAT_DATA instead of explicit member access.
Ken Raeburn <raeburn@raeburn.org>
parents:
25600
diff
changeset
|
1930 for (; CONSP (thismap); thismap = XCDR (thismap)) |
1209
1aa2cd425737
* keymap.c (DENSE_TABLE_SIZE): Doc fix.
Jim Blandy <jimb@redhat.com>
parents:
1160
diff
changeset
|
1931 { |
6502
18dfda644bc0
(access_keymap, store_in_keymap, Fcopy_keymap, Fdefine_key,
Karl Heuer <kwzh@gnu.org>
parents:
6475
diff
changeset
|
1932 Lisp_Object elt; |
18dfda644bc0
(access_keymap, store_in_keymap, Fcopy_keymap, Fdefine_key,
Karl Heuer <kwzh@gnu.org>
parents:
6475
diff
changeset
|
1933 |
25662
0a7261c1d487
Use XCAR, XCDR, and XFLOAT_DATA instead of explicit member access.
Ken Raeburn <raeburn@raeburn.org>
parents:
25600
diff
changeset
|
1934 elt = XCAR (thismap); |
250 | 1935 |
1209
1aa2cd425737
* keymap.c (DENSE_TABLE_SIZE): Doc fix.
Jim Blandy <jimb@redhat.com>
parents:
1160
diff
changeset
|
1936 QUIT; |
250 | 1937 |
17788
208d71ea3a4f
(get_keyelt): Handle an indirect entry with meta char.
Richard M. Stallman <rms@gnu.org>
parents:
17511
diff
changeset
|
1938 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
|
1939 { |
20076
374e09781f08
(Faccessible_keymaps): Avoid alloca for fixed-size array.
Karl Heuer <kwzh@gnu.org>
parents:
20070
diff
changeset
|
1940 Lisp_Object indices[3]; |
17788
208d71ea3a4f
(get_keyelt): Handle an indirect entry with meta char.
Richard M. Stallman <rms@gnu.org>
parents:
17511
diff
changeset
|
1941 |
51034
a5bb1c5181ac
(Fset_keymap_parent, map_keymap, Fcopy_keymap)
Richard M. Stallman <rms@gnu.org>
parents:
50828
diff
changeset
|
1942 map_char_table (accessible_keymaps_char_table, Qnil, elt, |
36406
f5bdd1200e0e
(Faccessible_keymaps): Pass `is_metized' to accessible_keymaps_char_table.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
36405
diff
changeset
|
1943 elt, Fcons (Fcons (maps, make_number (is_metized)), |
36405
7fe1b8d8fc44
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
36373
diff
changeset
|
1944 Fcons (tail, thisseq)), |
17788
208d71ea3a4f
(get_keyelt): Handle an indirect entry with meta char.
Richard M. Stallman <rms@gnu.org>
parents:
17511
diff
changeset
|
1945 0, indices); |
208d71ea3a4f
(get_keyelt): Handle an indirect entry with meta char.
Richard M. Stallman <rms@gnu.org>
parents:
17511
diff
changeset
|
1946 } |
208d71ea3a4f
(get_keyelt): Handle an indirect entry with meta char.
Richard M. Stallman <rms@gnu.org>
parents:
17511
diff
changeset
|
1947 else if (VECTORP (elt)) |
250 | 1948 { |
1949 register int i; | |
1950 | |
1951 /* Vector keymap. Scan all the elements. */ | |
32846
c1b3ab2a1ccc
Use AREF, ASET and ASIZE macros.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
32844
diff
changeset
|
1952 for (i = 0; i < ASIZE (elt); i++) |
39689
0572449a62be
(Fkeymap_prompt, Fcurrent_active_maps): New funs.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
39682
diff
changeset
|
1953 accessible_keymaps_1 (make_number (i), AREF (elt, i), |
0572449a62be
(Fkeymap_prompt, Fcurrent_active_maps): New funs.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
39682
diff
changeset
|
1954 maps, tail, thisseq, is_metized); |
45279
220c13a65624
(keymap_parent): New fun, extracted from Fkeymap_parent.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
45235
diff
changeset
|
1955 |
17788
208d71ea3a4f
(get_keyelt): Handle an indirect entry with meta char.
Richard M. Stallman <rms@gnu.org>
parents:
17511
diff
changeset
|
1956 } |
1209
1aa2cd425737
* keymap.c (DENSE_TABLE_SIZE): Doc fix.
Jim Blandy <jimb@redhat.com>
parents:
1160
diff
changeset
|
1957 else if (CONSP (elt)) |
39689
0572449a62be
(Fkeymap_prompt, Fcurrent_active_maps): New funs.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
39682
diff
changeset
|
1958 accessible_keymaps_1 (XCAR (elt), XCDR (elt), |
0572449a62be
(Fkeymap_prompt, Fcurrent_active_maps): New funs.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
39682
diff
changeset
|
1959 maps, tail, thisseq, |
0572449a62be
(Fkeymap_prompt, Fcurrent_active_maps): New funs.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
39682
diff
changeset
|
1960 is_metized && INTEGERP (XCAR (elt))); |
45279
220c13a65624
(keymap_parent): New fun, extracted from Fkeymap_parent.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
45235
diff
changeset
|
1961 |
250 | 1962 } |
1963 } | |
1964 | |
50189
c7ce12a3b9c2
(accessible_keymaps_1): Break cycles but without preventing
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
50141
diff
changeset
|
1965 return maps; |
250 | 1966 } |
17788
208d71ea3a4f
(get_keyelt): Handle an indirect entry with meta char.
Richard M. Stallman <rms@gnu.org>
parents:
17511
diff
changeset
|
1967 |
250 | 1968 Lisp_Object Qsingle_key_description, Qkey_description; |
1969 | |
7998
d4b5f4dd9c51
(Flookup_key): Add gcpro.
Richard M. Stallman <rms@gnu.org>
parents:
7894
diff
changeset
|
1970 /* This function cannot GC. */ |
d4b5f4dd9c51
(Flookup_key): Add gcpro.
Richard M. Stallman <rms@gnu.org>
parents:
7894
diff
changeset
|
1971 |
54925
f0a7441d22f6
(Fkey_description): Add optional PREFIX arg.
Kim F. Storm <storm@cua.dk>
parents:
53808
diff
changeset
|
1972 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
|
1973 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
|
1974 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
|
1975 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
|
1976 spaces are put between sequence elements, etc. */) |
54925
f0a7441d22f6
(Fkey_description): Add optional PREFIX arg.
Kim F. Storm <storm@cua.dk>
parents:
53808
diff
changeset
|
1977 (keys, prefix) |
f0a7441d22f6
(Fkey_description): Add optional PREFIX arg.
Kim F. Storm <storm@cua.dk>
parents:
53808
diff
changeset
|
1978 Lisp_Object keys, prefix; |
250 | 1979 { |
31829
43566b0aec59
Avoid some more compiler warnings.
Gerd Moellmann <gerd@gnu.org>
parents:
31496
diff
changeset
|
1980 int len = 0; |
20624
9ac0b485cf60
(describe_vector): Unconditionally handle multibyte chars.
Richard M. Stallman <rms@gnu.org>
parents:
20576
diff
changeset
|
1981 int i, i_byte; |
54925
f0a7441d22f6
(Fkey_description): Add optional PREFIX arg.
Kim F. Storm <storm@cua.dk>
parents:
53808
diff
changeset
|
1982 Lisp_Object *args; |
55006
5429150a04f3
(Fkey_description): Fix the usual int/Lisp_Object mixup.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
54925
diff
changeset
|
1983 int size = XINT (Flength (keys)); |
54925
f0a7441d22f6
(Fkey_description): Add optional PREFIX arg.
Kim F. Storm <storm@cua.dk>
parents:
53808
diff
changeset
|
1984 Lisp_Object list; |
f0a7441d22f6
(Fkey_description): Add optional PREFIX arg.
Kim F. Storm <storm@cua.dk>
parents:
53808
diff
changeset
|
1985 Lisp_Object sep = build_string (" "); |
f0a7441d22f6
(Fkey_description): Add optional PREFIX arg.
Kim F. Storm <storm@cua.dk>
parents:
53808
diff
changeset
|
1986 Lisp_Object key; |
f0a7441d22f6
(Fkey_description): Add optional PREFIX arg.
Kim F. Storm <storm@cua.dk>
parents:
53808
diff
changeset
|
1987 int add_meta = 0; |
f0a7441d22f6
(Fkey_description): Add optional PREFIX arg.
Kim F. Storm <storm@cua.dk>
parents:
53808
diff
changeset
|
1988 |
f0a7441d22f6
(Fkey_description): Add optional PREFIX arg.
Kim F. Storm <storm@cua.dk>
parents:
53808
diff
changeset
|
1989 if (!NILP (prefix)) |
55006
5429150a04f3
(Fkey_description): Fix the usual int/Lisp_Object mixup.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
54925
diff
changeset
|
1990 size += XINT (Flength (prefix)); |
54925
f0a7441d22f6
(Fkey_description): Add optional PREFIX arg.
Kim F. Storm <storm@cua.dk>
parents:
53808
diff
changeset
|
1991 |
f0a7441d22f6
(Fkey_description): Add optional PREFIX arg.
Kim F. Storm <storm@cua.dk>
parents:
53808
diff
changeset
|
1992 /* 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
|
1993 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
|
1994 |
f0a7441d22f6
(Fkey_description): Add optional PREFIX arg.
Kim F. Storm <storm@cua.dk>
parents:
53808
diff
changeset
|
1995 /* In effect, this computes |
f0a7441d22f6
(Fkey_description): Add optional PREFIX arg.
Kim F. Storm <storm@cua.dk>
parents:
53808
diff
changeset
|
1996 (mapconcat 'single-key-description keys " ") |
f0a7441d22f6
(Fkey_description): Add optional PREFIX arg.
Kim F. Storm <storm@cua.dk>
parents:
53808
diff
changeset
|
1997 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
|
1998 |
f0a7441d22f6
(Fkey_description): Add optional PREFIX arg.
Kim F. Storm <storm@cua.dk>
parents:
53808
diff
changeset
|
1999 next_list: |
f0a7441d22f6
(Fkey_description): Add optional PREFIX arg.
Kim F. Storm <storm@cua.dk>
parents:
53808
diff
changeset
|
2000 if (!NILP (prefix)) |
f0a7441d22f6
(Fkey_description): Add optional PREFIX arg.
Kim F. Storm <storm@cua.dk>
parents:
53808
diff
changeset
|
2001 list = prefix, prefix = Qnil; |
f0a7441d22f6
(Fkey_description): Add optional PREFIX arg.
Kim F. Storm <storm@cua.dk>
parents:
53808
diff
changeset
|
2002 else if (!NILP (keys)) |
f0a7441d22f6
(Fkey_description): Add optional PREFIX arg.
Kim F. Storm <storm@cua.dk>
parents:
53808
diff
changeset
|
2003 list = keys, keys = Qnil; |
f0a7441d22f6
(Fkey_description): Add optional PREFIX arg.
Kim F. Storm <storm@cua.dk>
parents:
53808
diff
changeset
|
2004 else |
2059 | 2005 { |
54925
f0a7441d22f6
(Fkey_description): Add optional PREFIX arg.
Kim F. Storm <storm@cua.dk>
parents:
53808
diff
changeset
|
2006 if (add_meta) |
f0a7441d22f6
(Fkey_description): Add optional PREFIX arg.
Kim F. Storm <storm@cua.dk>
parents:
53808
diff
changeset
|
2007 { |
f0a7441d22f6
(Fkey_description): Add optional PREFIX arg.
Kim F. Storm <storm@cua.dk>
parents:
53808
diff
changeset
|
2008 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
|
2009 len += 2; |
f0a7441d22f6
(Fkey_description): Add optional PREFIX arg.
Kim F. Storm <storm@cua.dk>
parents:
53808
diff
changeset
|
2010 } |
f0a7441d22f6
(Fkey_description): Add optional PREFIX arg.
Kim F. Storm <storm@cua.dk>
parents:
53808
diff
changeset
|
2011 else if (len == 0) |
f0a7441d22f6
(Fkey_description): Add optional PREFIX arg.
Kim F. Storm <storm@cua.dk>
parents:
53808
diff
changeset
|
2012 return empty_string; |
f0a7441d22f6
(Fkey_description): Add optional PREFIX arg.
Kim F. Storm <storm@cua.dk>
parents:
53808
diff
changeset
|
2013 return Fconcat (len - 1, args); |
f0a7441d22f6
(Fkey_description): Add optional PREFIX arg.
Kim F. Storm <storm@cua.dk>
parents:
53808
diff
changeset
|
2014 } |
f0a7441d22f6
(Fkey_description): Add optional PREFIX arg.
Kim F. Storm <storm@cua.dk>
parents:
53808
diff
changeset
|
2015 |
f0a7441d22f6
(Fkey_description): Add optional PREFIX arg.
Kim F. Storm <storm@cua.dk>
parents:
53808
diff
changeset
|
2016 if (STRINGP (list)) |
f0a7441d22f6
(Fkey_description): Add optional PREFIX arg.
Kim F. Storm <storm@cua.dk>
parents:
53808
diff
changeset
|
2017 size = SCHARS (list); |
f0a7441d22f6
(Fkey_description): Add optional PREFIX arg.
Kim F. Storm <storm@cua.dk>
parents:
53808
diff
changeset
|
2018 else if (VECTORP (list)) |
f0a7441d22f6
(Fkey_description): Add optional PREFIX arg.
Kim F. Storm <storm@cua.dk>
parents:
53808
diff
changeset
|
2019 size = XVECTOR (list)->size; |
f0a7441d22f6
(Fkey_description): Add optional PREFIX arg.
Kim F. Storm <storm@cua.dk>
parents:
53808
diff
changeset
|
2020 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
|
2021 size = XINT (Flength (list)); |
54925
f0a7441d22f6
(Fkey_description): Add optional PREFIX arg.
Kim F. Storm <storm@cua.dk>
parents:
53808
diff
changeset
|
2022 else |
f0a7441d22f6
(Fkey_description): Add optional PREFIX arg.
Kim F. Storm <storm@cua.dk>
parents:
53808
diff
changeset
|
2023 wrong_type_argument (Qarrayp, list); |
f0a7441d22f6
(Fkey_description): Add optional PREFIX arg.
Kim F. Storm <storm@cua.dk>
parents:
53808
diff
changeset
|
2024 |
f0a7441d22f6
(Fkey_description): Add optional PREFIX arg.
Kim F. Storm <storm@cua.dk>
parents:
53808
diff
changeset
|
2025 i = i_byte = 0; |
f0a7441d22f6
(Fkey_description): Add optional PREFIX arg.
Kim F. Storm <storm@cua.dk>
parents:
53808
diff
changeset
|
2026 |
f0a7441d22f6
(Fkey_description): Add optional PREFIX arg.
Kim F. Storm <storm@cua.dk>
parents:
53808
diff
changeset
|
2027 while (i < size) |
f0a7441d22f6
(Fkey_description): Add optional PREFIX arg.
Kim F. Storm <storm@cua.dk>
parents:
53808
diff
changeset
|
2028 { |
f0a7441d22f6
(Fkey_description): Add optional PREFIX arg.
Kim F. Storm <storm@cua.dk>
parents:
53808
diff
changeset
|
2029 if (STRINGP (list)) |
2059 | 2030 { |
20624
9ac0b485cf60
(describe_vector): Unconditionally handle multibyte chars.
Richard M. Stallman <rms@gnu.org>
parents:
20576
diff
changeset
|
2031 int c; |
54925
f0a7441d22f6
(Fkey_description): Add optional PREFIX arg.
Kim F. Storm <storm@cua.dk>
parents:
53808
diff
changeset
|
2032 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
|
2033 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
|
2034 c ^= 0200 | meta_modifier; |
54925
f0a7441d22f6
(Fkey_description): Add optional PREFIX arg.
Kim F. Storm <storm@cua.dk>
parents:
53808
diff
changeset
|
2035 XSETFASTINT (key, c); |
f0a7441d22f6
(Fkey_description): Add optional PREFIX arg.
Kim F. Storm <storm@cua.dk>
parents:
53808
diff
changeset
|
2036 } |
f0a7441d22f6
(Fkey_description): Add optional PREFIX arg.
Kim F. Storm <storm@cua.dk>
parents:
53808
diff
changeset
|
2037 else if (VECTORP (list)) |
f0a7441d22f6
(Fkey_description): Add optional PREFIX arg.
Kim F. Storm <storm@cua.dk>
parents:
53808
diff
changeset
|
2038 { |
f0a7441d22f6
(Fkey_description): Add optional PREFIX arg.
Kim F. Storm <storm@cua.dk>
parents:
53808
diff
changeset
|
2039 key = AREF (list, i++); |
f0a7441d22f6
(Fkey_description): Add optional PREFIX arg.
Kim F. Storm <storm@cua.dk>
parents:
53808
diff
changeset
|
2040 } |
f0a7441d22f6
(Fkey_description): Add optional PREFIX arg.
Kim F. Storm <storm@cua.dk>
parents:
53808
diff
changeset
|
2041 else |
f0a7441d22f6
(Fkey_description): Add optional PREFIX arg.
Kim F. Storm <storm@cua.dk>
parents:
53808
diff
changeset
|
2042 { |
f0a7441d22f6
(Fkey_description): Add optional PREFIX arg.
Kim F. Storm <storm@cua.dk>
parents:
53808
diff
changeset
|
2043 key = XCAR (list); |
f0a7441d22f6
(Fkey_description): Add optional PREFIX arg.
Kim F. Storm <storm@cua.dk>
parents:
53808
diff
changeset
|
2044 list = XCDR (list); |
f0a7441d22f6
(Fkey_description): Add optional PREFIX arg.
Kim F. Storm <storm@cua.dk>
parents:
53808
diff
changeset
|
2045 i++; |
2059 | 2046 } |
54925
f0a7441d22f6
(Fkey_description): Add optional PREFIX arg.
Kim F. Storm <storm@cua.dk>
parents:
53808
diff
changeset
|
2047 |
f0a7441d22f6
(Fkey_description): Add optional PREFIX arg.
Kim F. Storm <storm@cua.dk>
parents:
53808
diff
changeset
|
2048 if (add_meta) |
23953
c8cdb4e487cb
(Fsingle_key_description): Handle (control ?x) etc.
Richard M. Stallman <rms@gnu.org>
parents:
23776
diff
changeset
|
2049 { |
54925
f0a7441d22f6
(Fkey_description): Add optional PREFIX arg.
Kim F. Storm <storm@cua.dk>
parents:
53808
diff
changeset
|
2050 if (!INTEGERP (key) |
f0a7441d22f6
(Fkey_description): Add optional PREFIX arg.
Kim F. Storm <storm@cua.dk>
parents:
53808
diff
changeset
|
2051 || EQ (key, meta_prefix_char) |
f0a7441d22f6
(Fkey_description): Add optional PREFIX arg.
Kim F. Storm <storm@cua.dk>
parents:
53808
diff
changeset
|
2052 || (XINT (key) & meta_modifier)) |
f0a7441d22f6
(Fkey_description): Add optional PREFIX arg.
Kim F. Storm <storm@cua.dk>
parents:
53808
diff
changeset
|
2053 { |
f0a7441d22f6
(Fkey_description): Add optional PREFIX arg.
Kim F. Storm <storm@cua.dk>
parents:
53808
diff
changeset
|
2054 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
|
2055 args[len++] = sep; |
f0a7441d22f6
(Fkey_description): Add optional PREFIX arg.
Kim F. Storm <storm@cua.dk>
parents:
53808
diff
changeset
|
2056 if (EQ (key, meta_prefix_char)) |
f0a7441d22f6
(Fkey_description): Add optional PREFIX arg.
Kim F. Storm <storm@cua.dk>
parents:
53808
diff
changeset
|
2057 continue; |
f0a7441d22f6
(Fkey_description): Add optional PREFIX arg.
Kim F. Storm <storm@cua.dk>
parents:
53808
diff
changeset
|
2058 } |
f0a7441d22f6
(Fkey_description): Add optional PREFIX arg.
Kim F. Storm <storm@cua.dk>
parents:
53808
diff
changeset
|
2059 else |
f0a7441d22f6
(Fkey_description): Add optional PREFIX arg.
Kim F. Storm <storm@cua.dk>
parents:
53808
diff
changeset
|
2060 XSETINT (key, (XINT (key) | meta_modifier) & ~0x80); |
f0a7441d22f6
(Fkey_description): Add optional PREFIX arg.
Kim F. Storm <storm@cua.dk>
parents:
53808
diff
changeset
|
2061 add_meta = 0; |
23953
c8cdb4e487cb
(Fsingle_key_description): Handle (control ?x) etc.
Richard M. Stallman <rms@gnu.org>
parents:
23776
diff
changeset
|
2062 } |
54925
f0a7441d22f6
(Fkey_description): Add optional PREFIX arg.
Kim F. Storm <storm@cua.dk>
parents:
53808
diff
changeset
|
2063 else if (EQ (key, meta_prefix_char)) |
f0a7441d22f6
(Fkey_description): Add optional PREFIX arg.
Kim F. Storm <storm@cua.dk>
parents:
53808
diff
changeset
|
2064 { |
f0a7441d22f6
(Fkey_description): Add optional PREFIX arg.
Kim F. Storm <storm@cua.dk>
parents:
53808
diff
changeset
|
2065 add_meta = 1; |
f0a7441d22f6
(Fkey_description): Add optional PREFIX arg.
Kim F. Storm <storm@cua.dk>
parents:
53808
diff
changeset
|
2066 continue; |
f0a7441d22f6
(Fkey_description): Add optional PREFIX arg.
Kim F. Storm <storm@cua.dk>
parents:
53808
diff
changeset
|
2067 } |
f0a7441d22f6
(Fkey_description): Add optional PREFIX arg.
Kim F. Storm <storm@cua.dk>
parents:
53808
diff
changeset
|
2068 args[len++] = Fsingle_key_description (key, Qnil); |
f0a7441d22f6
(Fkey_description): Add optional PREFIX arg.
Kim F. Storm <storm@cua.dk>
parents:
53808
diff
changeset
|
2069 args[len++] = sep; |
23953
c8cdb4e487cb
(Fsingle_key_description): Handle (control ?x) etc.
Richard M. Stallman <rms@gnu.org>
parents:
23776
diff
changeset
|
2070 } |
54925
f0a7441d22f6
(Fkey_description): Add optional PREFIX arg.
Kim F. Storm <storm@cua.dk>
parents:
53808
diff
changeset
|
2071 goto next_list; |
250 | 2072 } |
2073 | |
54925
f0a7441d22f6
(Fkey_description): Add optional PREFIX arg.
Kim F. Storm <storm@cua.dk>
parents:
53808
diff
changeset
|
2074 |
250 | 2075 char * |
34906
333a490b6ebc
(push_key_description): Add parameter FORCE_MULTIBYTE.
Gerd Moellmann <gerd@gnu.org>
parents:
34765
diff
changeset
|
2076 push_key_description (c, p, force_multibyte) |
250 | 2077 register unsigned int c; |
2078 register char *p; | |
34906
333a490b6ebc
(push_key_description): Add parameter FORCE_MULTIBYTE.
Gerd Moellmann <gerd@gnu.org>
parents:
34765
diff
changeset
|
2079 int force_multibyte; |
250 | 2080 { |
30780
b4fcea50ee82
(push_key_description): If C without modifiers is < 32,
Gerd Moellmann <gerd@gnu.org>
parents:
30609
diff
changeset
|
2081 unsigned c2; |
45279
220c13a65624
(keymap_parent): New fun, extracted from Fkeymap_parent.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
45235
diff
changeset
|
2082 |
2343
ddb30eaf2f56
(push_key_description): Ignore bits above meta_modifier.
Richard M. Stallman <rms@gnu.org>
parents:
2093
diff
changeset
|
2083 /* 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
|
2084 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
|
2085 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
|
2086 | 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
|
2087 |
2059 | 2088 if (c & alt_modifier) |
2089 { | |
2090 *p++ = 'A'; | |
2091 *p++ = '-'; | |
2092 c -= alt_modifier; | |
2093 } | |
30780
b4fcea50ee82
(push_key_description): If C without modifiers is < 32,
Gerd Moellmann <gerd@gnu.org>
parents:
30609
diff
changeset
|
2094 if ((c & ctrl_modifier) != 0 |
b4fcea50ee82
(push_key_description): If C without modifiers is < 32,
Gerd Moellmann <gerd@gnu.org>
parents:
30609
diff
changeset
|
2095 || (c2 < ' ' && c2 != 27 && c2 != '\t' && c2 != Ctl ('M'))) |
2059 | 2096 { |
2097 *p++ = 'C'; | |
2098 *p++ = '-'; | |
30780
b4fcea50ee82
(push_key_description): If C without modifiers is < 32,
Gerd Moellmann <gerd@gnu.org>
parents:
30609
diff
changeset
|
2099 c &= ~ctrl_modifier; |
2059 | 2100 } |
2101 if (c & hyper_modifier) | |
2102 { | |
2103 *p++ = 'H'; | |
2104 *p++ = '-'; | |
2105 c -= hyper_modifier; | |
2106 } | |
2107 if (c & meta_modifier) | |
250 | 2108 { |
2109 *p++ = 'M'; | |
2110 *p++ = '-'; | |
2059 | 2111 c -= meta_modifier; |
2112 } | |
2113 if (c & shift_modifier) | |
2114 { | |
2115 *p++ = 'S'; | |
2116 *p++ = '-'; | |
2117 c -= shift_modifier; | |
2118 } | |
2119 if (c & super_modifier) | |
2120 { | |
2121 *p++ = 's'; | |
2122 *p++ = '-'; | |
2123 c -= super_modifier; | |
250 | 2124 } |
2125 if (c < 040) | |
2126 { | |
2127 if (c == 033) | |
2128 { | |
2129 *p++ = 'E'; | |
2130 *p++ = 'S'; | |
2131 *p++ = 'C'; | |
2132 } | |
2059 | 2133 else if (c == '\t') |
250 | 2134 { |
2135 *p++ = 'T'; | |
2136 *p++ = 'A'; | |
2137 *p++ = 'B'; | |
2138 } | |
16875
d9956cf6699b
(push_key_description): Print C-j, not TAB.
Richard M. Stallman <rms@gnu.org>
parents:
16465
diff
changeset
|
2139 else if (c == Ctl ('M')) |
250 | 2140 { |
2141 *p++ = 'R'; | |
2142 *p++ = 'E'; | |
2143 *p++ = 'T'; | |
2144 } | |
2145 else | |
2146 { | |
30780
b4fcea50ee82
(push_key_description): If C without modifiers is < 32,
Gerd Moellmann <gerd@gnu.org>
parents:
30609
diff
changeset
|
2147 /* `C-' already added above. */ |
250 | 2148 if (c > 0 && c <= Ctl ('Z')) |
2149 *p++ = c + 0140; | |
2150 else | |
2151 *p++ = c + 0100; | |
2152 } | |
2153 } | |
2154 else if (c == 0177) | |
2155 { | |
2156 *p++ = 'D'; | |
2157 *p++ = 'E'; | |
2158 *p++ = 'L'; | |
2159 } | |
2160 else if (c == ' ') | |
24394
8159c8cb33cc
(push_key_description): If enable-multibyte-characters
Kenichi Handa <handa@m17n.org>
parents:
23968
diff
changeset
|
2161 { |
250 | 2162 *p++ = 'S'; |
2163 *p++ = 'P'; | |
2164 *p++ = 'C'; | |
2165 } | |
24396
340189fd508f
(push_key_description): If enable-multibyte-characters
Kenichi Handa <handa@m17n.org>
parents:
24394
diff
changeset
|
2166 else if (c < 128 |
340189fd508f
(push_key_description): If enable-multibyte-characters
Kenichi Handa <handa@m17n.org>
parents:
24394
diff
changeset
|
2167 || (NILP (current_buffer->enable_multibyte_characters) |
34906
333a490b6ebc
(push_key_description): Add parameter FORCE_MULTIBYTE.
Gerd Moellmann <gerd@gnu.org>
parents:
34765
diff
changeset
|
2168 && SINGLE_BYTE_CHAR_P (c) |
333a490b6ebc
(push_key_description): Add parameter FORCE_MULTIBYTE.
Gerd Moellmann <gerd@gnu.org>
parents:
34765
diff
changeset
|
2169 && !force_multibyte)) |
333a490b6ebc
(push_key_description): Add parameter FORCE_MULTIBYTE.
Gerd Moellmann <gerd@gnu.org>
parents:
34765
diff
changeset
|
2170 { |
333a490b6ebc
(push_key_description): Add parameter FORCE_MULTIBYTE.
Gerd Moellmann <gerd@gnu.org>
parents:
34765
diff
changeset
|
2171 *p++ = c; |
333a490b6ebc
(push_key_description): Add parameter FORCE_MULTIBYTE.
Gerd Moellmann <gerd@gnu.org>
parents:
34765
diff
changeset
|
2172 } |
250 | 2173 else |
2059 | 2174 { |
34906
333a490b6ebc
(push_key_description): Add parameter FORCE_MULTIBYTE.
Gerd Moellmann <gerd@gnu.org>
parents:
34765
diff
changeset
|
2175 int valid_p = SINGLE_BYTE_CHAR_P (c) || char_valid_p (c, 0); |
45279
220c13a65624
(keymap_parent): New fun, extracted from Fkeymap_parent.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
45235
diff
changeset
|
2176 |
34906
333a490b6ebc
(push_key_description): Add parameter FORCE_MULTIBYTE.
Gerd Moellmann <gerd@gnu.org>
parents:
34765
diff
changeset
|
2177 if (force_multibyte && valid_p) |
333a490b6ebc
(push_key_description): Add parameter FORCE_MULTIBYTE.
Gerd Moellmann <gerd@gnu.org>
parents:
34765
diff
changeset
|
2178 { |
333a490b6ebc
(push_key_description): Add parameter FORCE_MULTIBYTE.
Gerd Moellmann <gerd@gnu.org>
parents:
34765
diff
changeset
|
2179 if (SINGLE_BYTE_CHAR_P (c)) |
333a490b6ebc
(push_key_description): Add parameter FORCE_MULTIBYTE.
Gerd Moellmann <gerd@gnu.org>
parents:
34765
diff
changeset
|
2180 c = unibyte_char_to_multibyte (c); |
333a490b6ebc
(push_key_description): Add parameter FORCE_MULTIBYTE.
Gerd Moellmann <gerd@gnu.org>
parents:
34765
diff
changeset
|
2181 p += CHAR_STRING (c, p); |
333a490b6ebc
(push_key_description): Add parameter FORCE_MULTIBYTE.
Gerd Moellmann <gerd@gnu.org>
parents:
34765
diff
changeset
|
2182 } |
333a490b6ebc
(push_key_description): Add parameter FORCE_MULTIBYTE.
Gerd Moellmann <gerd@gnu.org>
parents:
34765
diff
changeset
|
2183 else if (NILP (current_buffer->enable_multibyte_characters) |
333a490b6ebc
(push_key_description): Add parameter FORCE_MULTIBYTE.
Gerd Moellmann <gerd@gnu.org>
parents:
34765
diff
changeset
|
2184 || valid_p) |
24394
8159c8cb33cc
(push_key_description): If enable-multibyte-characters
Kenichi Handa <handa@m17n.org>
parents:
23968
diff
changeset
|
2185 { |
8159c8cb33cc
(push_key_description): If enable-multibyte-characters
Kenichi Handa <handa@m17n.org>
parents:
23968
diff
changeset
|
2186 int bit_offset; |
8159c8cb33cc
(push_key_description): If enable-multibyte-characters
Kenichi Handa <handa@m17n.org>
parents:
23968
diff
changeset
|
2187 *p++ = '\\'; |
8159c8cb33cc
(push_key_description): If enable-multibyte-characters
Kenichi Handa <handa@m17n.org>
parents:
23968
diff
changeset
|
2188 /* The biggest character code uses 19 bits. */ |
8159c8cb33cc
(push_key_description): If enable-multibyte-characters
Kenichi Handa <handa@m17n.org>
parents:
23968
diff
changeset
|
2189 for (bit_offset = 18; bit_offset >= 0; bit_offset -= 3) |
8159c8cb33cc
(push_key_description): If enable-multibyte-characters
Kenichi Handa <handa@m17n.org>
parents:
23968
diff
changeset
|
2190 { |
8159c8cb33cc
(push_key_description): If enable-multibyte-characters
Kenichi Handa <handa@m17n.org>
parents:
23968
diff
changeset
|
2191 if (c >= (1 << bit_offset)) |
8159c8cb33cc
(push_key_description): If enable-multibyte-characters
Kenichi Handa <handa@m17n.org>
parents:
23968
diff
changeset
|
2192 *p++ = ((c & (7 << bit_offset)) >> bit_offset) + '0'; |
8159c8cb33cc
(push_key_description): If enable-multibyte-characters
Kenichi Handa <handa@m17n.org>
parents:
23968
diff
changeset
|
2193 } |
8159c8cb33cc
(push_key_description): If enable-multibyte-characters
Kenichi Handa <handa@m17n.org>
parents:
23968
diff
changeset
|
2194 } |
8159c8cb33cc
(push_key_description): If enable-multibyte-characters
Kenichi Handa <handa@m17n.org>
parents:
23968
diff
changeset
|
2195 else |
34906
333a490b6ebc
(push_key_description): Add parameter FORCE_MULTIBYTE.
Gerd Moellmann <gerd@gnu.org>
parents:
34765
diff
changeset
|
2196 p += CHAR_STRING (c, p); |
2059 | 2197 } |
250 | 2198 |
41293
3db86c7bf56f
(Fdescribe_vector): Add `describer' parameter.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
41001
diff
changeset
|
2199 return p; |
250 | 2200 } |
2201 | |
7998
d4b5f4dd9c51
(Flookup_key): Add gcpro.
Richard M. Stallman <rms@gnu.org>
parents:
7894
diff
changeset
|
2202 /* This function cannot GC. */ |
d4b5f4dd9c51
(Flookup_key): Add gcpro.
Richard M. Stallman <rms@gnu.org>
parents:
7894
diff
changeset
|
2203 |
30559
16a291eedbd8
(Fsingle_key_description): Add parameter NO_ANGLES.
Gerd Moellmann <gerd@gnu.org>
parents:
30134
diff
changeset
|
2204 DEFUN ("single-key-description", Fsingle_key_description, |
16a291eedbd8
(Fsingle_key_description): Add parameter NO_ANGLES.
Gerd Moellmann <gerd@gnu.org>
parents:
30134
diff
changeset
|
2205 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
|
2206 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
|
2207 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
|
2208 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
|
2209 around function keys and event symbols. */) |
a17c8b15ef1b
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
40804
diff
changeset
|
2210 (key, no_angles) |
30559
16a291eedbd8
(Fsingle_key_description): Add parameter NO_ANGLES.
Gerd Moellmann <gerd@gnu.org>
parents:
30134
diff
changeset
|
2211 Lisp_Object key, no_angles; |
250 | 2212 { |
23953
c8cdb4e487cb
(Fsingle_key_description): Handle (control ?x) etc.
Richard M. Stallman <rms@gnu.org>
parents:
23776
diff
changeset
|
2213 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
|
2214 key = Fevent_convert_list (key); |
c8cdb4e487cb
(Fsingle_key_description): Handle (control ?x) etc.
Richard M. Stallman <rms@gnu.org>
parents:
23776
diff
changeset
|
2215 |
1315
884c3d7e7172
* keymap.c (access_keymap, store_in_keymap,
Jim Blandy <jimb@redhat.com>
parents:
1264
diff
changeset
|
2216 key = EVENT_HEAD (key); |
517 | 2217 |
10008
b83150a8020d
(Fsingle_key_description): Use type test macros.
Karl Heuer <kwzh@gnu.org>
parents:
9973
diff
changeset
|
2218 if (INTEGERP (key)) /* Normal character */ |
250 | 2219 { |
23734
44546fc7faad
(Fsingle_key_description): Handle generic characters.
Richard M. Stallman <rms@gnu.org>
parents:
22841
diff
changeset
|
2220 unsigned int charset, c1, c2; |
23776
529965d3c653
(Fsingle_key_description): Fix previous change.
Richard M. Stallman <rms@gnu.org>
parents:
23758
diff
changeset
|
2221 int without_bits = XINT (key) & ~((-1) << CHARACTERBITS); |
529965d3c653
(Fsingle_key_description): Fix previous change.
Richard M. Stallman <rms@gnu.org>
parents:
23758
diff
changeset
|
2222 |
529965d3c653
(Fsingle_key_description): Fix previous change.
Richard M. Stallman <rms@gnu.org>
parents:
23758
diff
changeset
|
2223 if (SINGLE_BYTE_CHAR_P (without_bits)) |
23734
44546fc7faad
(Fsingle_key_description): Handle generic characters.
Richard M. Stallman <rms@gnu.org>
parents:
22841
diff
changeset
|
2224 charset = 0; |
44546fc7faad
(Fsingle_key_description): Handle generic characters.
Richard M. Stallman <rms@gnu.org>
parents:
22841
diff
changeset
|
2225 else |
29013
b9565b4bcdf8
(Fsingle_key_description): Use SPLIT_CHAR instead of
Kenichi Handa <handa@m17n.org>
parents:
26864
diff
changeset
|
2226 SPLIT_CHAR (without_bits, charset, c1, c2); |
23734
44546fc7faad
(Fsingle_key_description): Handle generic characters.
Richard M. Stallman <rms@gnu.org>
parents:
22841
diff
changeset
|
2227 |
44546fc7faad
(Fsingle_key_description): Handle generic characters.
Richard M. Stallman <rms@gnu.org>
parents:
22841
diff
changeset
|
2228 if (charset |
24394
8159c8cb33cc
(push_key_description): If enable-multibyte-characters
Kenichi Handa <handa@m17n.org>
parents:
23968
diff
changeset
|
2229 && CHARSET_DEFINED_P (charset) |
23734
44546fc7faad
(Fsingle_key_description): Handle generic characters.
Richard M. Stallman <rms@gnu.org>
parents:
22841
diff
changeset
|
2230 && ((c1 >= 0 && c1 < 32) |
44546fc7faad
(Fsingle_key_description): Handle generic characters.
Richard M. Stallman <rms@gnu.org>
parents:
22841
diff
changeset
|
2231 || (c2 >= 0 && c2 < 32))) |
44546fc7faad
(Fsingle_key_description): Handle generic characters.
Richard M. Stallman <rms@gnu.org>
parents:
22841
diff
changeset
|
2232 { |
44546fc7faad
(Fsingle_key_description): Handle generic characters.
Richard M. Stallman <rms@gnu.org>
parents:
22841
diff
changeset
|
2233 /* Handle a generic character. */ |
44546fc7faad
(Fsingle_key_description): Handle generic characters.
Richard M. Stallman <rms@gnu.org>
parents:
22841
diff
changeset
|
2234 Lisp_Object name; |
44546fc7faad
(Fsingle_key_description): Handle generic characters.
Richard M. Stallman <rms@gnu.org>
parents:
22841
diff
changeset
|
2235 name = CHARSET_TABLE_INFO (charset, CHARSET_LONG_NAME_IDX); |
40656
cdfd4d09b79a
Update usage of CHECK_ macros (remove unused second argument).
Pavel Janík <Pavel@Janik.cz>
parents:
40625
diff
changeset
|
2236 CHECK_STRING (name); |
23734
44546fc7faad
(Fsingle_key_description): Handle generic characters.
Richard M. Stallman <rms@gnu.org>
parents:
22841
diff
changeset
|
2237 return concat2 (build_string ("Character set "), name); |
44546fc7faad
(Fsingle_key_description): Handle generic characters.
Richard M. Stallman <rms@gnu.org>
parents:
22841
diff
changeset
|
2238 } |
44546fc7faad
(Fsingle_key_description): Handle generic characters.
Richard M. Stallman <rms@gnu.org>
parents:
22841
diff
changeset
|
2239 else |
44546fc7faad
(Fsingle_key_description): Handle generic characters.
Richard M. Stallman <rms@gnu.org>
parents:
22841
diff
changeset
|
2240 { |
37930
ee47b5c14208
(Fsingle_key_description): Create a multibyte string
Gerd Moellmann <gerd@gnu.org>
parents:
37747
diff
changeset
|
2241 char tem[KEY_DESCRIPTION_SIZE], *end; |
ee47b5c14208
(Fsingle_key_description): Create a multibyte string
Gerd Moellmann <gerd@gnu.org>
parents:
37747
diff
changeset
|
2242 int nbytes, nchars; |
ee47b5c14208
(Fsingle_key_description): Create a multibyte string
Gerd Moellmann <gerd@gnu.org>
parents:
37747
diff
changeset
|
2243 Lisp_Object string; |
ee47b5c14208
(Fsingle_key_description): Create a multibyte string
Gerd Moellmann <gerd@gnu.org>
parents:
37747
diff
changeset
|
2244 |
ee47b5c14208
(Fsingle_key_description): Create a multibyte string
Gerd Moellmann <gerd@gnu.org>
parents:
37747
diff
changeset
|
2245 end = push_key_description (XUINT (key), tem, 1); |
ee47b5c14208
(Fsingle_key_description): Create a multibyte string
Gerd Moellmann <gerd@gnu.org>
parents:
37747
diff
changeset
|
2246 nbytes = end - tem; |
ee47b5c14208
(Fsingle_key_description): Create a multibyte string
Gerd Moellmann <gerd@gnu.org>
parents:
37747
diff
changeset
|
2247 nchars = multibyte_chars_in_text (tem, nbytes); |
ee47b5c14208
(Fsingle_key_description): Create a multibyte string
Gerd Moellmann <gerd@gnu.org>
parents:
37747
diff
changeset
|
2248 if (nchars == nbytes) |
37938
fdd419d4776a
(Fsingle_key_description): NUL-terminate the string
Gerd Moellmann <gerd@gnu.org>
parents:
37930
diff
changeset
|
2249 { |
fdd419d4776a
(Fsingle_key_description): NUL-terminate the string
Gerd Moellmann <gerd@gnu.org>
parents:
37930
diff
changeset
|
2250 *end = '\0'; |
fdd419d4776a
(Fsingle_key_description): NUL-terminate the string
Gerd Moellmann <gerd@gnu.org>
parents:
37930
diff
changeset
|
2251 string = build_string (tem); |
fdd419d4776a
(Fsingle_key_description): NUL-terminate the string
Gerd Moellmann <gerd@gnu.org>
parents:
37930
diff
changeset
|
2252 } |
37930
ee47b5c14208
(Fsingle_key_description): Create a multibyte string
Gerd Moellmann <gerd@gnu.org>
parents:
37747
diff
changeset
|
2253 else |
ee47b5c14208
(Fsingle_key_description): Create a multibyte string
Gerd Moellmann <gerd@gnu.org>
parents:
37747
diff
changeset
|
2254 string = make_multibyte_string (tem, nchars, nbytes); |
ee47b5c14208
(Fsingle_key_description): Create a multibyte string
Gerd Moellmann <gerd@gnu.org>
parents:
37747
diff
changeset
|
2255 return string; |
23734
44546fc7faad
(Fsingle_key_description): Handle generic characters.
Richard M. Stallman <rms@gnu.org>
parents:
22841
diff
changeset
|
2256 } |
250 | 2257 } |
10008
b83150a8020d
(Fsingle_key_description): Use type test macros.
Karl Heuer <kwzh@gnu.org>
parents:
9973
diff
changeset
|
2258 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
|
2259 { |
30559
16a291eedbd8
(Fsingle_key_description): Add parameter NO_ANGLES.
Gerd Moellmann <gerd@gnu.org>
parents:
30134
diff
changeset
|
2260 if (NILP (no_angles)) |
16a291eedbd8
(Fsingle_key_description): Add parameter NO_ANGLES.
Gerd Moellmann <gerd@gnu.org>
parents:
30134
diff
changeset
|
2261 { |
16a291eedbd8
(Fsingle_key_description): Add parameter NO_ANGLES.
Gerd Moellmann <gerd@gnu.org>
parents:
30134
diff
changeset
|
2262 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
|
2263 = (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
|
2264 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
|
2265 return build_string (buffer); |
16a291eedbd8
(Fsingle_key_description): Add parameter NO_ANGLES.
Gerd Moellmann <gerd@gnu.org>
parents:
30134
diff
changeset
|
2266 } |
16a291eedbd8
(Fsingle_key_description): Add parameter NO_ANGLES.
Gerd Moellmann <gerd@gnu.org>
parents:
30134
diff
changeset
|
2267 else |
16a291eedbd8
(Fsingle_key_description): Add parameter NO_ANGLES.
Gerd Moellmann <gerd@gnu.org>
parents:
30134
diff
changeset
|
2268 return Fsymbol_name (key); |
29651
31099bb76b6e
(Fsingle_key_description): Enclose function key and
Gerd Moellmann <gerd@gnu.org>
parents:
29282
diff
changeset
|
2269 } |
10008
b83150a8020d
(Fsingle_key_description): Use type test macros.
Karl Heuer <kwzh@gnu.org>
parents:
9973
diff
changeset
|
2270 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
|
2271 return Fcopy_sequence (key); |
b83150a8020d
(Fsingle_key_description): Use type test macros.
Karl Heuer <kwzh@gnu.org>
parents:
9973
diff
changeset
|
2272 else |
b83150a8020d
(Fsingle_key_description): Use type test macros.
Karl Heuer <kwzh@gnu.org>
parents:
9973
diff
changeset
|
2273 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
|
2274 return Qnil; |
250 | 2275 } |
2276 | |
2277 char * | |
2278 push_text_char_description (c, p) | |
2279 register unsigned int c; | |
2280 register char *p; | |
2281 { | |
2282 if (c >= 0200) | |
2283 { | |
2284 *p++ = 'M'; | |
2285 *p++ = '-'; | |
2286 c -= 0200; | |
2287 } | |
2288 if (c < 040) | |
2289 { | |
2290 *p++ = '^'; | |
2291 *p++ = c + 64; /* 'A' - 1 */ | |
2292 } | |
2293 else if (c == 0177) | |
2294 { | |
2295 *p++ = '^'; | |
2296 *p++ = '?'; | |
2297 } | |
2298 else | |
2299 *p++ = c; | |
41293
3db86c7bf56f
(Fdescribe_vector): Add `describer' parameter.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
41001
diff
changeset
|
2300 return p; |
250 | 2301 } |
2302 | |
7998
d4b5f4dd9c51
(Flookup_key): Add gcpro.
Richard M. Stallman <rms@gnu.org>
parents:
7894
diff
changeset
|
2303 /* This function cannot GC. */ |
d4b5f4dd9c51
(Flookup_key): Add gcpro.
Richard M. Stallman <rms@gnu.org>
parents:
7894
diff
changeset
|
2304 |
250 | 2305 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
|
2306 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
|
2307 Control characters turn into "^char", etc. This differs from |
dd79816933ec
(Ftext_char_description): Doc fix.
Luc Teirlinck <teirllm@auburn.edu>
parents:
55913
diff
changeset
|
2308 `single-key-description' which turns them into "C-char". |
dd79816933ec
(Ftext_char_description): Doc fix.
Luc Teirlinck <teirllm@auburn.edu>
parents:
55913
diff
changeset
|
2309 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
|
2310 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
|
2311 See Info node `(elisp)Describing Characters' for examples. */) |
41001
a17c8b15ef1b
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
40804
diff
changeset
|
2312 (character) |
14080
439185f0ef37
(Fkeymapp, Fdefine_prefix_command, Faccessible_keymaps,
Erik Naggum <erik@naggum.no>
parents:
13947
diff
changeset
|
2313 Lisp_Object character; |
250 | 2314 { |
26864
b89eb8bbaff1
(push_key_description): Adjusted for the change of
Kenichi Handa <handa@m17n.org>
parents:
26481
diff
changeset
|
2315 /* 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
|
2316 unsigned char str[6]; |
b89eb8bbaff1
(push_key_description): Adjusted for the change of
Kenichi Handa <handa@m17n.org>
parents:
26481
diff
changeset
|
2317 int c; |
250 | 2318 |
40656
cdfd4d09b79a
Update usage of CHECK_ macros (remove unused second argument).
Pavel Janík <Pavel@Janik.cz>
parents:
40625
diff
changeset
|
2319 CHECK_NUMBER (character); |
14080
439185f0ef37
(Fkeymapp, Fdefine_prefix_command, Faccessible_keymaps,
Erik Naggum <erik@naggum.no>
parents:
13947
diff
changeset
|
2320 |
26864
b89eb8bbaff1
(push_key_description): Adjusted for the change of
Kenichi Handa <handa@m17n.org>
parents:
26481
diff
changeset
|
2321 c = XINT (character); |
b89eb8bbaff1
(push_key_description): Adjusted for the change of
Kenichi Handa <handa@m17n.org>
parents:
26481
diff
changeset
|
2322 if (!SINGLE_BYTE_CHAR_P (c)) |
17036 | 2323 { |
26864
b89eb8bbaff1
(push_key_description): Adjusted for the change of
Kenichi Handa <handa@m17n.org>
parents:
26481
diff
changeset
|
2324 int len = CHAR_STRING (c, str); |
17036 | 2325 |
20624
9ac0b485cf60
(describe_vector): Unconditionally handle multibyte chars.
Richard M. Stallman <rms@gnu.org>
parents:
20576
diff
changeset
|
2326 return make_multibyte_string (str, 1, len); |
17036 | 2327 } |
2328 | |
26864
b89eb8bbaff1
(push_key_description): Adjusted for the change of
Kenichi Handa <handa@m17n.org>
parents:
26481
diff
changeset
|
2329 *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
|
2330 |
b89eb8bbaff1
(push_key_description): Adjusted for the change of
Kenichi Handa <handa@m17n.org>
parents:
26481
diff
changeset
|
2331 return build_string (str); |
250 | 2332 } |
2727
b8911c8b9700
* keymap.c (Fwhere_is_internal): If FIRSTONLY is non-nil, avoid
Jim Blandy <jimb@redhat.com>
parents:
2652
diff
changeset
|
2333 |
b8911c8b9700
* keymap.c (Fwhere_is_internal): If FIRSTONLY is non-nil, avoid
Jim Blandy <jimb@redhat.com>
parents:
2652
diff
changeset
|
2334 /* Return non-zero if SEQ contains only ASCII characters, perhaps with |
b8911c8b9700
* keymap.c (Fwhere_is_internal): If FIRSTONLY is non-nil, avoid
Jim Blandy <jimb@redhat.com>
parents:
2652
diff
changeset
|
2335 a meta bit. */ |
b8911c8b9700
* keymap.c (Fwhere_is_internal): If FIRSTONLY is non-nil, avoid
Jim Blandy <jimb@redhat.com>
parents:
2652
diff
changeset
|
2336 static int |
b8911c8b9700
* keymap.c (Fwhere_is_internal): If FIRSTONLY is non-nil, avoid
Jim Blandy <jimb@redhat.com>
parents:
2652
diff
changeset
|
2337 ascii_sequence_p (seq) |
b8911c8b9700
* keymap.c (Fwhere_is_internal): If FIRSTONLY is non-nil, avoid
Jim Blandy <jimb@redhat.com>
parents:
2652
diff
changeset
|
2338 Lisp_Object seq; |
b8911c8b9700
* keymap.c (Fwhere_is_internal): If FIRSTONLY is non-nil, avoid
Jim Blandy <jimb@redhat.com>
parents:
2652
diff
changeset
|
2339 { |
9312
dfaf1d41e53d
(synkey, access_keymap, store_in_keymap, Faccessible_keymaps,
Karl Heuer <kwzh@gnu.org>
parents:
9273
diff
changeset
|
2340 int i; |
2727
b8911c8b9700
* keymap.c (Fwhere_is_internal): If FIRSTONLY is non-nil, avoid
Jim Blandy <jimb@redhat.com>
parents:
2652
diff
changeset
|
2341 int len = XINT (Flength (seq)); |
6008
d3ccce72be00
(get_keyelt): Discard keyboard equivalents
Richard M. Stallman <rms@gnu.org>
parents:
5785
diff
changeset
|
2342 |
9312
dfaf1d41e53d
(synkey, access_keymap, store_in_keymap, Faccessible_keymaps,
Karl Heuer <kwzh@gnu.org>
parents:
9273
diff
changeset
|
2343 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
|
2344 { |
9312
dfaf1d41e53d
(synkey, access_keymap, store_in_keymap, Faccessible_keymaps,
Karl Heuer <kwzh@gnu.org>
parents:
9273
diff
changeset
|
2345 Lisp_Object ii, elt; |
6008
d3ccce72be00
(get_keyelt): Discard keyboard equivalents
Richard M. Stallman <rms@gnu.org>
parents:
5785
diff
changeset
|
2346 |
9312
dfaf1d41e53d
(synkey, access_keymap, store_in_keymap, Faccessible_keymaps,
Karl Heuer <kwzh@gnu.org>
parents:
9273
diff
changeset
|
2347 XSETFASTINT (ii, i); |
dfaf1d41e53d
(synkey, access_keymap, store_in_keymap, Faccessible_keymaps,
Karl Heuer <kwzh@gnu.org>
parents:
9273
diff
changeset
|
2348 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
|
2349 |
9123
c225137ddefb
(get_keyelt, store_in_keymap, Fcopy_keymap, Fdefine_key, Flookup_key,
Karl Heuer <kwzh@gnu.org>
parents:
8922
diff
changeset
|
2350 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
|
2351 || (XUINT (elt) & ~CHAR_META) >= 0x80) |
b8911c8b9700
* keymap.c (Fwhere_is_internal): If FIRSTONLY is non-nil, avoid
Jim Blandy <jimb@redhat.com>
parents:
2652
diff
changeset
|
2352 return 0; |
b8911c8b9700
* keymap.c (Fwhere_is_internal): If FIRSTONLY is non-nil, avoid
Jim Blandy <jimb@redhat.com>
parents:
2652
diff
changeset
|
2353 } |
b8911c8b9700
* keymap.c (Fwhere_is_internal): If FIRSTONLY is non-nil, avoid
Jim Blandy <jimb@redhat.com>
parents:
2652
diff
changeset
|
2354 |
b8911c8b9700
* keymap.c (Fwhere_is_internal): If FIRSTONLY is non-nil, avoid
Jim Blandy <jimb@redhat.com>
parents:
2652
diff
changeset
|
2355 return 1; |
b8911c8b9700
* keymap.c (Fwhere_is_internal): If FIRSTONLY is non-nil, avoid
Jim Blandy <jimb@redhat.com>
parents:
2652
diff
changeset
|
2356 } |
b8911c8b9700
* keymap.c (Fwhere_is_internal): If FIRSTONLY is non-nil, avoid
Jim Blandy <jimb@redhat.com>
parents:
2652
diff
changeset
|
2357 |
250 | 2358 |
465 | 2359 /* where-is - finding a command in a set of keymaps. */ |
2360 | |
43152
0029b0259426
(Fdefine_key): Allow symbol as KEY argument for
Kim F. Storm <storm@cua.dk>
parents:
42510
diff
changeset
|
2361 static Lisp_Object where_is_internal (); |
17788
208d71ea3a4f
(get_keyelt): Handle an indirect entry with meta char.
Richard M. Stallman <rms@gnu.org>
parents:
17511
diff
changeset
|
2362 static Lisp_Object where_is_internal_1 (); |
20319
81424cf4d446
(copy_keymap_1): Fix return type.
Andreas Schwab <schwab@suse.de>
parents:
20076
diff
changeset
|
2363 static void where_is_internal_2 (); |
17788
208d71ea3a4f
(get_keyelt): Handle an indirect entry with meta char.
Richard M. Stallman <rms@gnu.org>
parents:
17511
diff
changeset
|
2364 |
32846
c1b3ab2a1ccc
Use AREF, ASET and ASIZE macros.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
32844
diff
changeset
|
2365 /* Like Flookup_key, but uses a list of keymaps SHADOW instead of a single map. |
c1b3ab2a1ccc
Use AREF, ASET and ASIZE macros.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
32844
diff
changeset
|
2366 Returns the first non-nil binding found in any of those maps. */ |
c1b3ab2a1ccc
Use AREF, ASET and ASIZE macros.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
32844
diff
changeset
|
2367 |
c1b3ab2a1ccc
Use AREF, ASET and ASIZE macros.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
32844
diff
changeset
|
2368 static Lisp_Object |
c1b3ab2a1ccc
Use AREF, ASET and ASIZE macros.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
32844
diff
changeset
|
2369 shadow_lookup (shadow, key, flag) |
c1b3ab2a1ccc
Use AREF, ASET and ASIZE macros.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
32844
diff
changeset
|
2370 Lisp_Object shadow, key, flag; |
c1b3ab2a1ccc
Use AREF, ASET and ASIZE macros.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
32844
diff
changeset
|
2371 { |
c1b3ab2a1ccc
Use AREF, ASET and ASIZE macros.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
32844
diff
changeset
|
2372 Lisp_Object tail, value; |
c1b3ab2a1ccc
Use AREF, ASET and ASIZE macros.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
32844
diff
changeset
|
2373 |
c1b3ab2a1ccc
Use AREF, ASET and ASIZE macros.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
32844
diff
changeset
|
2374 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
|
2375 { |
c1b3ab2a1ccc
Use AREF, ASET and ASIZE macros.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
32844
diff
changeset
|
2376 value = Flookup_key (XCAR (tail), key, flag); |
c1b3ab2a1ccc
Use AREF, ASET and ASIZE macros.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
32844
diff
changeset
|
2377 if (!NILP (value) && !NATNUMP (value)) |
c1b3ab2a1ccc
Use AREF, ASET and ASIZE macros.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
32844
diff
changeset
|
2378 return value; |
c1b3ab2a1ccc
Use AREF, ASET and ASIZE macros.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
32844
diff
changeset
|
2379 } |
c1b3ab2a1ccc
Use AREF, ASET and ASIZE macros.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
32844
diff
changeset
|
2380 return Qnil; |
c1b3ab2a1ccc
Use AREF, ASET and ASIZE macros.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
32844
diff
changeset
|
2381 } |
c1b3ab2a1ccc
Use AREF, ASET and ASIZE macros.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
32844
diff
changeset
|
2382 |
53808
aa6be081315b
(Vmouse_events): Rename from Vmenu_events.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
52740
diff
changeset
|
2383 static Lisp_Object Vmouse_events; |
50141
3770fda038d0
(Vmenu_events): New var.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49912
diff
changeset
|
2384 |
32846
c1b3ab2a1ccc
Use AREF, ASET and ASIZE macros.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
32844
diff
changeset
|
2385 /* This function can GC if Flookup_key autoloads any keymaps. */ |
c1b3ab2a1ccc
Use AREF, ASET and ASIZE macros.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
32844
diff
changeset
|
2386 |
32889
673e3ef1f7f6
(where_is_cache, where_is_cache_keymaps): New vars.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
32846
diff
changeset
|
2387 static Lisp_Object |
43152
0029b0259426
(Fdefine_key): Allow symbol as KEY argument for
Kim F. Storm <storm@cua.dk>
parents:
42510
diff
changeset
|
2388 where_is_internal (definition, keymaps, firstonly, noindirect, no_remap) |
32889
673e3ef1f7f6
(where_is_cache, where_is_cache_keymaps): New vars.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
32846
diff
changeset
|
2389 Lisp_Object definition, keymaps; |
43152
0029b0259426
(Fdefine_key): Allow symbol as KEY argument for
Kim F. Storm <storm@cua.dk>
parents:
42510
diff
changeset
|
2390 Lisp_Object firstonly, noindirect, no_remap; |
250 | 2391 { |
32846
c1b3ab2a1ccc
Use AREF, ASET and ASIZE macros.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
32844
diff
changeset
|
2392 Lisp_Object maps = Qnil; |
17788
208d71ea3a4f
(get_keyelt): Handle an indirect entry with meta char.
Richard M. Stallman <rms@gnu.org>
parents:
17511
diff
changeset
|
2393 Lisp_Object found, sequences; |
7998
d4b5f4dd9c51
(Flookup_key): Add gcpro.
Richard M. Stallman <rms@gnu.org>
parents:
7894
diff
changeset
|
2394 struct gcpro gcpro1, gcpro2, gcpro3, gcpro4, gcpro5; |
10810
9b418bde9fcf
(Fwhere_is_internal): If FIRSTONLY is not nil or non-ascii,
Richard M. Stallman <rms@gnu.org>
parents:
10541
diff
changeset
|
2395 /* 1 means ignore all menu bindings entirely. */ |
9b418bde9fcf
(Fwhere_is_internal): If FIRSTONLY is not nil or non-ascii,
Richard M. Stallman <rms@gnu.org>
parents:
10541
diff
changeset
|
2396 int nomenus = !NILP (firstonly) && !EQ (firstonly, Qnon_ascii); |
250 | 2397 |
43152
0029b0259426
(Fdefine_key): Allow symbol as KEY argument for
Kim F. Storm <storm@cua.dk>
parents:
42510
diff
changeset
|
2398 /* If this command is remapped, then it has no key bindings |
0029b0259426
(Fdefine_key): Allow symbol as KEY argument for
Kim F. Storm <storm@cua.dk>
parents:
42510
diff
changeset
|
2399 of its own. */ |
43494
b5b76b498398
The following changes rework my patch of 2002-02-06 which
Kim F. Storm <storm@cua.dk>
parents:
43164
diff
changeset
|
2400 if (NILP (no_remap) && SYMBOLP (definition)) |
b5b76b498398
The following changes rework my patch of 2002-02-06 which
Kim F. Storm <storm@cua.dk>
parents:
43164
diff
changeset
|
2401 { |
b5b76b498398
The following changes rework my patch of 2002-02-06 which
Kim F. Storm <storm@cua.dk>
parents:
43164
diff
changeset
|
2402 Lisp_Object tem; |
49757
9fe119b14379
Renamed remap-command to command-remapping. All uses changed.
Kim F. Storm <storm@cua.dk>
parents:
49720
diff
changeset
|
2403 if (tem = Fcommand_remapping (definition), !NILP (tem)) |
43494
b5b76b498398
The following changes rework my patch of 2002-02-06 which
Kim F. Storm <storm@cua.dk>
parents:
43164
diff
changeset
|
2404 return Qnil; |
b5b76b498398
The following changes rework my patch of 2002-02-06 which
Kim F. Storm <storm@cua.dk>
parents:
43164
diff
changeset
|
2405 } |
43152
0029b0259426
(Fdefine_key): Allow symbol as KEY argument for
Kim F. Storm <storm@cua.dk>
parents:
42510
diff
changeset
|
2406 |
32846
c1b3ab2a1ccc
Use AREF, ASET and ASIZE macros.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
32844
diff
changeset
|
2407 found = keymaps; |
c1b3ab2a1ccc
Use AREF, ASET and ASIZE macros.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
32844
diff
changeset
|
2408 while (CONSP (found)) |
29282 | 2409 { |
32846
c1b3ab2a1ccc
Use AREF, ASET and ASIZE macros.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
32844
diff
changeset
|
2410 maps = |
32988
c3435dc00ed7
* lisp.h (KEYMAPP): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
32889
diff
changeset
|
2411 nconc2 (maps, |
c3435dc00ed7
* lisp.h (KEYMAPP): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
32889
diff
changeset
|
2412 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
|
2413 found = XCDR (found); |
29282 | 2414 } |
45279
220c13a65624
(keymap_parent): New fun, extracted from Fkeymap_parent.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
45235
diff
changeset
|
2415 |
32846
c1b3ab2a1ccc
Use AREF, ASET and ASIZE macros.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
32844
diff
changeset
|
2416 GCPRO5 (definition, keymaps, maps, found, sequences); |
250 | 2417 found = Qnil; |
17788
208d71ea3a4f
(get_keyelt): Handle an indirect entry with meta char.
Richard M. Stallman <rms@gnu.org>
parents:
17511
diff
changeset
|
2418 sequences = Qnil; |
250 | 2419 |
485 | 2420 for (; !NILP (maps); maps = Fcdr (maps)) |
250 | 2421 { |
6502
18dfda644bc0
(access_keymap, store_in_keymap, Fcopy_keymap, Fdefine_key,
Karl Heuer <kwzh@gnu.org>
parents:
6475
diff
changeset
|
2422 /* 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
|
2423 register Lisp_Object this, map, tem; |
1209
1aa2cd425737
* keymap.c (DENSE_TABLE_SIZE): Doc fix.
Jim Blandy <jimb@redhat.com>
parents:
1160
diff
changeset
|
2424 |
250 | 2425 /* In order to fold [META-PREFIX-CHAR CHAR] sequences into |
2426 [M-CHAR] sequences, check if last character of the sequence | |
2427 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
|
2428 Lisp_Object last; |
18dfda644bc0
(access_keymap, store_in_keymap, Fcopy_keymap, Fdefine_key,
Karl Heuer <kwzh@gnu.org>
parents:
6475
diff
changeset
|
2429 int last_is_meta; |
18dfda644bc0
(access_keymap, store_in_keymap, Fcopy_keymap, Fdefine_key,
Karl Heuer <kwzh@gnu.org>
parents:
6475
diff
changeset
|
2430 |
18dfda644bc0
(access_keymap, store_in_keymap, Fcopy_keymap, Fdefine_key,
Karl Heuer <kwzh@gnu.org>
parents:
6475
diff
changeset
|
2431 this = Fcar (Fcar (maps)); |
18dfda644bc0
(access_keymap, store_in_keymap, Fcopy_keymap, Fdefine_key,
Karl Heuer <kwzh@gnu.org>
parents:
6475
diff
changeset
|
2432 map = Fcdr (Fcar (maps)); |
18dfda644bc0
(access_keymap, store_in_keymap, Fcopy_keymap, Fdefine_key,
Karl Heuer <kwzh@gnu.org>
parents:
6475
diff
changeset
|
2433 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
|
2434 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
|
2435 && EQ (Faref (this, last), meta_prefix_char)); |
250 | 2436 |
36373
274190d289d7
(where_is_internal): Accept non-ascii integer prefixes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
35781
diff
changeset
|
2437 /* if (nomenus && !ascii_sequence_p (this)) */ |
36405
7fe1b8d8fc44
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
36373
diff
changeset
|
2438 if (nomenus && XINT (last) >= 0 |
50141
3770fda038d0
(Vmenu_events): New var.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49912
diff
changeset
|
2439 && 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
|
2440 && !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
|
2441 /* 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
|
2442 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
|
2443 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
|
2444 continue; |
45279
220c13a65624
(keymap_parent): New fun, extracted from Fkeymap_parent.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
45235
diff
changeset
|
2445 |
1236
5e8c234e5f03
* keymap.c (access_keymap): Remove code to notice bindings for
Jim Blandy <jimb@redhat.com>
parents:
1209
diff
changeset
|
2446 QUIT; |
5e8c234e5f03
* keymap.c (access_keymap): Remove code to notice bindings for
Jim Blandy <jimb@redhat.com>
parents:
1209
diff
changeset
|
2447 |
1209
1aa2cd425737
* keymap.c (DENSE_TABLE_SIZE): Doc fix.
Jim Blandy <jimb@redhat.com>
parents:
1160
diff
changeset
|
2448 while (CONSP (map)) |
1aa2cd425737
* keymap.c (DENSE_TABLE_SIZE): Doc fix.
Jim Blandy <jimb@redhat.com>
parents:
1160
diff
changeset
|
2449 { |
1aa2cd425737
* keymap.c (DENSE_TABLE_SIZE): Doc fix.
Jim Blandy <jimb@redhat.com>
parents:
1160
diff
changeset
|
2450 /* Because the code we want to run on each binding is rather |
1aa2cd425737
* keymap.c (DENSE_TABLE_SIZE): Doc fix.
Jim Blandy <jimb@redhat.com>
parents:
1160
diff
changeset
|
2451 large, we don't want to have two separate loop bodies for |
1aa2cd425737
* keymap.c (DENSE_TABLE_SIZE): Doc fix.
Jim Blandy <jimb@redhat.com>
parents:
1160
diff
changeset
|
2452 sparse keymap bindings and tables; we want to iterate one |
1aa2cd425737
* keymap.c (DENSE_TABLE_SIZE): Doc fix.
Jim Blandy <jimb@redhat.com>
parents:
1160
diff
changeset
|
2453 loop body over both keymap and vector bindings. |
250 | 2454 |
1209
1aa2cd425737
* keymap.c (DENSE_TABLE_SIZE): Doc fix.
Jim Blandy <jimb@redhat.com>
parents:
1160
diff
changeset
|
2455 For this reason, if Fcar (map) is a vector, we don't |
1aa2cd425737
* keymap.c (DENSE_TABLE_SIZE): Doc fix.
Jim Blandy <jimb@redhat.com>
parents:
1160
diff
changeset
|
2456 advance map to the next element until i indicates that we |
1aa2cd425737
* keymap.c (DENSE_TABLE_SIZE): Doc fix.
Jim Blandy <jimb@redhat.com>
parents:
1160
diff
changeset
|
2457 have finished off the vector. */ |
7998
d4b5f4dd9c51
(Flookup_key): Add gcpro.
Richard M. Stallman <rms@gnu.org>
parents:
7894
diff
changeset
|
2458 Lisp_Object elt, key, binding; |
25662
0a7261c1d487
Use XCAR, XCDR, and XFLOAT_DATA instead of explicit member access.
Ken Raeburn <raeburn@raeburn.org>
parents:
25600
diff
changeset
|
2459 elt = XCAR (map); |
0a7261c1d487
Use XCAR, XCDR, and XFLOAT_DATA instead of explicit member access.
Ken Raeburn <raeburn@raeburn.org>
parents:
25600
diff
changeset
|
2460 map = XCDR (map); |
17788
208d71ea3a4f
(get_keyelt): Handle an indirect entry with meta char.
Richard M. Stallman <rms@gnu.org>
parents:
17511
diff
changeset
|
2461 |
208d71ea3a4f
(get_keyelt): Handle an indirect entry with meta char.
Richard M. Stallman <rms@gnu.org>
parents:
17511
diff
changeset
|
2462 sequences = Qnil; |
250 | 2463 |
1236
5e8c234e5f03
* keymap.c (access_keymap): Remove code to notice bindings for
Jim Blandy <jimb@redhat.com>
parents:
1209
diff
changeset
|
2464 QUIT; |
5e8c234e5f03
* keymap.c (access_keymap): Remove code to notice bindings for
Jim Blandy <jimb@redhat.com>
parents:
1209
diff
changeset
|
2465 |
1209
1aa2cd425737
* keymap.c (DENSE_TABLE_SIZE): Doc fix.
Jim Blandy <jimb@redhat.com>
parents:
1160
diff
changeset
|
2466 /* Set key and binding to the current key and binding, and |
1aa2cd425737
* keymap.c (DENSE_TABLE_SIZE): Doc fix.
Jim Blandy <jimb@redhat.com>
parents:
1160
diff
changeset
|
2467 advance map and i to the next binding. */ |
9123
c225137ddefb
(get_keyelt, store_in_keymap, Fcopy_keymap, Fdefine_key, Flookup_key,
Karl Heuer <kwzh@gnu.org>
parents:
8922
diff
changeset
|
2468 if (VECTORP (elt)) |
250 | 2469 { |
17788
208d71ea3a4f
(get_keyelt): Handle an indirect entry with meta char.
Richard M. Stallman <rms@gnu.org>
parents:
17511
diff
changeset
|
2470 Lisp_Object sequence; |
208d71ea3a4f
(get_keyelt): Handle an indirect entry with meta char.
Richard M. Stallman <rms@gnu.org>
parents:
17511
diff
changeset
|
2471 int i; |
250 | 2472 /* In a vector, look at each element. */ |
17788
208d71ea3a4f
(get_keyelt): Handle an indirect entry with meta char.
Richard M. Stallman <rms@gnu.org>
parents:
17511
diff
changeset
|
2473 for (i = 0; i < XVECTOR (elt)->size; i++) |
1209
1aa2cd425737
* keymap.c (DENSE_TABLE_SIZE): Doc fix.
Jim Blandy <jimb@redhat.com>
parents:
1160
diff
changeset
|
2474 { |
32846
c1b3ab2a1ccc
Use AREF, ASET and ASIZE macros.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
32844
diff
changeset
|
2475 binding = AREF (elt, i); |
17788
208d71ea3a4f
(get_keyelt): Handle an indirect entry with meta char.
Richard M. Stallman <rms@gnu.org>
parents:
17511
diff
changeset
|
2476 XSETFASTINT (key, i); |
208d71ea3a4f
(get_keyelt): Handle an indirect entry with meta char.
Richard M. Stallman <rms@gnu.org>
parents:
17511
diff
changeset
|
2477 sequence = where_is_internal_1 (binding, key, definition, |
32846
c1b3ab2a1ccc
Use AREF, ASET and ASIZE macros.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
32844
diff
changeset
|
2478 noindirect, this, |
17788
208d71ea3a4f
(get_keyelt): Handle an indirect entry with meta char.
Richard M. Stallman <rms@gnu.org>
parents:
17511
diff
changeset
|
2479 last, nomenus, last_is_meta); |
208d71ea3a4f
(get_keyelt): Handle an indirect entry with meta char.
Richard M. Stallman <rms@gnu.org>
parents:
17511
diff
changeset
|
2480 if (!NILP (sequence)) |
208d71ea3a4f
(get_keyelt): Handle an indirect entry with meta char.
Richard M. Stallman <rms@gnu.org>
parents:
17511
diff
changeset
|
2481 sequences = Fcons (sequence, sequences); |
1209
1aa2cd425737
* keymap.c (DENSE_TABLE_SIZE): Doc fix.
Jim Blandy <jimb@redhat.com>
parents:
1160
diff
changeset
|
2482 } |
250 | 2483 } |
17788
208d71ea3a4f
(get_keyelt): Handle an indirect entry with meta char.
Richard M. Stallman <rms@gnu.org>
parents:
17511
diff
changeset
|
2484 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
|
2485 { |
20076
374e09781f08
(Faccessible_keymaps): Avoid alloca for fixed-size array.
Karl Heuer <kwzh@gnu.org>
parents:
20070
diff
changeset
|
2486 Lisp_Object indices[3]; |
17788
208d71ea3a4f
(get_keyelt): Handle an indirect entry with meta char.
Richard M. Stallman <rms@gnu.org>
parents:
17511
diff
changeset
|
2487 Lisp_Object args; |
20076
374e09781f08
(Faccessible_keymaps): Avoid alloca for fixed-size array.
Karl Heuer <kwzh@gnu.org>
parents:
20070
diff
changeset
|
2488 |
17788
208d71ea3a4f
(get_keyelt): Handle an indirect entry with meta char.
Richard M. Stallman <rms@gnu.org>
parents:
17511
diff
changeset
|
2489 args = Fcons (Fcons (Fcons (definition, noindirect), |
32846
c1b3ab2a1ccc
Use AREF, ASET and ASIZE macros.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
32844
diff
changeset
|
2490 Qnil), /* Result accumulator. */ |
17788
208d71ea3a4f
(get_keyelt): Handle an indirect entry with meta char.
Richard M. Stallman <rms@gnu.org>
parents:
17511
diff
changeset
|
2491 Fcons (Fcons (this, last), |
208d71ea3a4f
(get_keyelt): Handle an indirect entry with meta char.
Richard M. Stallman <rms@gnu.org>
parents:
17511
diff
changeset
|
2492 Fcons (make_number (nomenus), |
208d71ea3a4f
(get_keyelt): Handle an indirect entry with meta char.
Richard M. Stallman <rms@gnu.org>
parents:
17511
diff
changeset
|
2493 make_number (last_is_meta)))); |
51034
a5bb1c5181ac
(Fset_keymap_parent, map_keymap, Fcopy_keymap)
Richard M. Stallman <rms@gnu.org>
parents:
50828
diff
changeset
|
2494 map_char_table (where_is_internal_2, Qnil, elt, elt, args, |
17788
208d71ea3a4f
(get_keyelt): Handle an indirect entry with meta char.
Richard M. Stallman <rms@gnu.org>
parents:
17511
diff
changeset
|
2495 0, indices); |
32846
c1b3ab2a1ccc
Use AREF, ASET and ASIZE macros.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
32844
diff
changeset
|
2496 sequences = XCDR (XCAR (args)); |
17788
208d71ea3a4f
(get_keyelt): Handle an indirect entry with meta char.
Richard M. Stallman <rms@gnu.org>
parents:
17511
diff
changeset
|
2497 } |
1209
1aa2cd425737
* keymap.c (DENSE_TABLE_SIZE): Doc fix.
Jim Blandy <jimb@redhat.com>
parents:
1160
diff
changeset
|
2498 else if (CONSP (elt)) |
250 | 2499 { |
17788
208d71ea3a4f
(get_keyelt): Handle an indirect entry with meta char.
Richard M. Stallman <rms@gnu.org>
parents:
17511
diff
changeset
|
2500 Lisp_Object sequence; |
208d71ea3a4f
(get_keyelt): Handle an indirect entry with meta char.
Richard M. Stallman <rms@gnu.org>
parents:
17511
diff
changeset
|
2501 |
25662
0a7261c1d487
Use XCAR, XCDR, and XFLOAT_DATA instead of explicit member access.
Ken Raeburn <raeburn@raeburn.org>
parents:
25600
diff
changeset
|
2502 key = XCAR (elt); |
0a7261c1d487
Use XCAR, XCDR, and XFLOAT_DATA instead of explicit member access.
Ken Raeburn <raeburn@raeburn.org>
parents:
25600
diff
changeset
|
2503 binding = XCDR (elt); |
17788
208d71ea3a4f
(get_keyelt): Handle an indirect entry with meta char.
Richard M. Stallman <rms@gnu.org>
parents:
17511
diff
changeset
|
2504 |
208d71ea3a4f
(get_keyelt): Handle an indirect entry with meta char.
Richard M. Stallman <rms@gnu.org>
parents:
17511
diff
changeset
|
2505 sequence = where_is_internal_1 (binding, key, definition, |
32846
c1b3ab2a1ccc
Use AREF, ASET and ASIZE macros.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
32844
diff
changeset
|
2506 noindirect, this, |
17788
208d71ea3a4f
(get_keyelt): Handle an indirect entry with meta char.
Richard M. Stallman <rms@gnu.org>
parents:
17511
diff
changeset
|
2507 last, nomenus, last_is_meta); |
208d71ea3a4f
(get_keyelt): Handle an indirect entry with meta char.
Richard M. Stallman <rms@gnu.org>
parents:
17511
diff
changeset
|
2508 if (!NILP (sequence)) |
208d71ea3a4f
(get_keyelt): Handle an indirect entry with meta char.
Richard M. Stallman <rms@gnu.org>
parents:
17511
diff
changeset
|
2509 sequences = Fcons (sequence, sequences); |
250 | 2510 } |
17788
208d71ea3a4f
(get_keyelt): Handle an indirect entry with meta char.
Richard M. Stallman <rms@gnu.org>
parents:
17511
diff
changeset
|
2511 |
208d71ea3a4f
(get_keyelt): Handle an indirect entry with meta char.
Richard M. Stallman <rms@gnu.org>
parents:
17511
diff
changeset
|
2512 |
43152
0029b0259426
(Fdefine_key): Allow symbol as KEY argument for
Kim F. Storm <storm@cua.dk>
parents:
42510
diff
changeset
|
2513 while (!NILP (sequences)) |
250 | 2514 { |
43494
b5b76b498398
The following changes rework my patch of 2002-02-06 which
Kim F. Storm <storm@cua.dk>
parents:
43164
diff
changeset
|
2515 Lisp_Object sequence, remapped, function; |
17788
208d71ea3a4f
(get_keyelt): Handle an indirect entry with meta char.
Richard M. Stallman <rms@gnu.org>
parents:
17511
diff
changeset
|
2516 |
25662
0a7261c1d487
Use XCAR, XCDR, and XFLOAT_DATA instead of explicit member access.
Ken Raeburn <raeburn@raeburn.org>
parents:
25600
diff
changeset
|
2517 sequence = XCAR (sequences); |
43152
0029b0259426
(Fdefine_key): Allow symbol as KEY argument for
Kim F. Storm <storm@cua.dk>
parents:
42510
diff
changeset
|
2518 sequences = XCDR (sequences); |
0029b0259426
(Fdefine_key): Allow symbol as KEY argument for
Kim F. Storm <storm@cua.dk>
parents:
42510
diff
changeset
|
2519 |
43494
b5b76b498398
The following changes rework my patch of 2002-02-06 which
Kim F. Storm <storm@cua.dk>
parents:
43164
diff
changeset
|
2520 /* If the current sequence is a command remapping with |
b5b76b498398
The following changes rework my patch of 2002-02-06 which
Kim F. Storm <storm@cua.dk>
parents:
43164
diff
changeset
|
2521 format [remap COMMAND], find the key sequences |
b5b76b498398
The following changes rework my patch of 2002-02-06 which
Kim F. Storm <storm@cua.dk>
parents:
43164
diff
changeset
|
2522 which run COMMAND, and use those sequences instead. */ |
43152
0029b0259426
(Fdefine_key): Allow symbol as KEY argument for
Kim F. Storm <storm@cua.dk>
parents:
42510
diff
changeset
|
2523 remapped = Qnil; |
0029b0259426
(Fdefine_key): Allow symbol as KEY argument for
Kim F. Storm <storm@cua.dk>
parents:
42510
diff
changeset
|
2524 if (NILP (no_remap) |
43494
b5b76b498398
The following changes rework my patch of 2002-02-06 which
Kim F. Storm <storm@cua.dk>
parents:
43164
diff
changeset
|
2525 && VECTORP (sequence) && XVECTOR (sequence)->size == 2 |
b5b76b498398
The following changes rework my patch of 2002-02-06 which
Kim F. Storm <storm@cua.dk>
parents:
43164
diff
changeset
|
2526 && EQ (AREF (sequence, 0), Qremap) |
b5b76b498398
The following changes rework my patch of 2002-02-06 which
Kim F. Storm <storm@cua.dk>
parents:
43164
diff
changeset
|
2527 && (function = AREF (sequence, 1), SYMBOLP (function))) |
43152
0029b0259426
(Fdefine_key): Allow symbol as KEY argument for
Kim F. Storm <storm@cua.dk>
parents:
42510
diff
changeset
|
2528 { |
43494
b5b76b498398
The following changes rework my patch of 2002-02-06 which
Kim F. Storm <storm@cua.dk>
parents:
43164
diff
changeset
|
2529 Lisp_Object remapped1; |
b5b76b498398
The following changes rework my patch of 2002-02-06 which
Kim F. Storm <storm@cua.dk>
parents:
43164
diff
changeset
|
2530 |
b5b76b498398
The following changes rework my patch of 2002-02-06 which
Kim F. Storm <storm@cua.dk>
parents:
43164
diff
changeset
|
2531 remapped1 = where_is_internal (function, keymaps, firstonly, noindirect, Qt); |
b5b76b498398
The following changes rework my patch of 2002-02-06 which
Kim F. Storm <storm@cua.dk>
parents:
43164
diff
changeset
|
2532 if (CONSP (remapped1)) |
43152
0029b0259426
(Fdefine_key): Allow symbol as KEY argument for
Kim F. Storm <storm@cua.dk>
parents:
42510
diff
changeset
|
2533 { |
43494
b5b76b498398
The following changes rework my patch of 2002-02-06 which
Kim F. Storm <storm@cua.dk>
parents:
43164
diff
changeset
|
2534 /* Verify that this key binding actually maps to the |
b5b76b498398
The following changes rework my patch of 2002-02-06 which
Kim F. Storm <storm@cua.dk>
parents:
43164
diff
changeset
|
2535 remapped command (see below). */ |
b5b76b498398
The following changes rework my patch of 2002-02-06 which
Kim F. Storm <storm@cua.dk>
parents:
43164
diff
changeset
|
2536 if (!EQ (shadow_lookup (keymaps, XCAR (remapped1), Qnil), function)) |
b5b76b498398
The following changes rework my patch of 2002-02-06 which
Kim F. Storm <storm@cua.dk>
parents:
43164
diff
changeset
|
2537 continue; |
b5b76b498398
The following changes rework my patch of 2002-02-06 which
Kim F. Storm <storm@cua.dk>
parents:
43164
diff
changeset
|
2538 sequence = XCAR (remapped1); |
b5b76b498398
The following changes rework my patch of 2002-02-06 which
Kim F. Storm <storm@cua.dk>
parents:
43164
diff
changeset
|
2539 remapped = XCDR (remapped1); |
b5b76b498398
The following changes rework my patch of 2002-02-06 which
Kim F. Storm <storm@cua.dk>
parents:
43164
diff
changeset
|
2540 goto record_sequence; |
43152
0029b0259426
(Fdefine_key): Allow symbol as KEY argument for
Kim F. Storm <storm@cua.dk>
parents:
42510
diff
changeset
|
2541 } |
0029b0259426
(Fdefine_key): Allow symbol as KEY argument for
Kim F. Storm <storm@cua.dk>
parents:
42510
diff
changeset
|
2542 } |
17788
208d71ea3a4f
(get_keyelt): Handle an indirect entry with meta char.
Richard M. Stallman <rms@gnu.org>
parents:
17511
diff
changeset
|
2543 |
32846
c1b3ab2a1ccc
Use AREF, ASET and ASIZE macros.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
32844
diff
changeset
|
2544 /* Verify that this key binding is not shadowed by another |
c1b3ab2a1ccc
Use AREF, ASET and ASIZE macros.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
32844
diff
changeset
|
2545 binding for the same key, before we say it exists. |
c1b3ab2a1ccc
Use AREF, ASET and ASIZE macros.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
32844
diff
changeset
|
2546 |
c1b3ab2a1ccc
Use AREF, ASET and ASIZE macros.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
32844
diff
changeset
|
2547 Mechanism: look for local definition of this key and if |
c1b3ab2a1ccc
Use AREF, ASET and ASIZE macros.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
32844
diff
changeset
|
2548 it is defined and does not match what we found then |
c1b3ab2a1ccc
Use AREF, ASET and ASIZE macros.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
32844
diff
changeset
|
2549 ignore this key. |
c1b3ab2a1ccc
Use AREF, ASET and ASIZE macros.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
32844
diff
changeset
|
2550 |
c1b3ab2a1ccc
Use AREF, ASET and ASIZE macros.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
32844
diff
changeset
|
2551 Either nil or number as value from Flookup_key |
c1b3ab2a1ccc
Use AREF, ASET and ASIZE macros.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
32844
diff
changeset
|
2552 means undefined. */ |
32889
673e3ef1f7f6
(where_is_cache, where_is_cache_keymaps): New vars.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
32846
diff
changeset
|
2553 if (!EQ (shadow_lookup (keymaps, sequence, Qnil), definition)) |
32846
c1b3ab2a1ccc
Use AREF, ASET and ASIZE macros.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
32844
diff
changeset
|
2554 continue; |
c1b3ab2a1ccc
Use AREF, ASET and ASIZE macros.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
32844
diff
changeset
|
2555 |
43152
0029b0259426
(Fdefine_key): Allow symbol as KEY argument for
Kim F. Storm <storm@cua.dk>
parents:
42510
diff
changeset
|
2556 record_sequence: |
17788
208d71ea3a4f
(get_keyelt): Handle an indirect entry with meta char.
Richard M. Stallman <rms@gnu.org>
parents:
17511
diff
changeset
|
2557 /* It is a true unshadowed match. Record it, unless it's already |
208d71ea3a4f
(get_keyelt): Handle an indirect entry with meta char.
Richard M. Stallman <rms@gnu.org>
parents:
17511
diff
changeset
|
2558 been seen (as could happen when inheriting keymaps). */ |
208d71ea3a4f
(get_keyelt): Handle an indirect entry with meta char.
Richard M. Stallman <rms@gnu.org>
parents:
17511
diff
changeset
|
2559 if (NILP (Fmember (sequence, found))) |
208d71ea3a4f
(get_keyelt): Handle an indirect entry with meta char.
Richard M. Stallman <rms@gnu.org>
parents:
17511
diff
changeset
|
2560 found = Fcons (sequence, found); |
208d71ea3a4f
(get_keyelt): Handle an indirect entry with meta char.
Richard M. Stallman <rms@gnu.org>
parents:
17511
diff
changeset
|
2561 |
208d71ea3a4f
(get_keyelt): Handle an indirect entry with meta char.
Richard M. Stallman <rms@gnu.org>
parents:
17511
diff
changeset
|
2562 /* If firstonly is Qnon_ascii, then we can return the first |
208d71ea3a4f
(get_keyelt): Handle an indirect entry with meta char.
Richard M. Stallman <rms@gnu.org>
parents:
17511
diff
changeset
|
2563 binding we find. If firstonly is not Qnon_ascii but not |
208d71ea3a4f
(get_keyelt): Handle an indirect entry with meta char.
Richard M. Stallman <rms@gnu.org>
parents:
17511
diff
changeset
|
2564 nil, then we should return the first ascii-only binding |
208d71ea3a4f
(get_keyelt): Handle an indirect entry with meta char.
Richard M. Stallman <rms@gnu.org>
parents:
17511
diff
changeset
|
2565 we find. */ |
208d71ea3a4f
(get_keyelt): Handle an indirect entry with meta char.
Richard M. Stallman <rms@gnu.org>
parents:
17511
diff
changeset
|
2566 if (EQ (firstonly, Qnon_ascii)) |
208d71ea3a4f
(get_keyelt): Handle an indirect entry with meta char.
Richard M. Stallman <rms@gnu.org>
parents:
17511
diff
changeset
|
2567 RETURN_UNGCPRO (sequence); |
39689
0572449a62be
(Fkeymap_prompt, Fcurrent_active_maps): New funs.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
39682
diff
changeset
|
2568 else if (!NILP (firstonly) && ascii_sequence_p (sequence)) |
17788
208d71ea3a4f
(get_keyelt): Handle an indirect entry with meta char.
Richard M. Stallman <rms@gnu.org>
parents:
17511
diff
changeset
|
2569 RETURN_UNGCPRO (sequence); |
43152
0029b0259426
(Fdefine_key): Allow symbol as KEY argument for
Kim F. Storm <storm@cua.dk>
parents:
42510
diff
changeset
|
2570 |
0029b0259426
(Fdefine_key): Allow symbol as KEY argument for
Kim F. Storm <storm@cua.dk>
parents:
42510
diff
changeset
|
2571 if (CONSP (remapped)) |
0029b0259426
(Fdefine_key): Allow symbol as KEY argument for
Kim F. Storm <storm@cua.dk>
parents:
42510
diff
changeset
|
2572 { |
0029b0259426
(Fdefine_key): Allow symbol as KEY argument for
Kim F. Storm <storm@cua.dk>
parents:
42510
diff
changeset
|
2573 sequence = XCAR (remapped); |
0029b0259426
(Fdefine_key): Allow symbol as KEY argument for
Kim F. Storm <storm@cua.dk>
parents:
42510
diff
changeset
|
2574 remapped = XCDR (remapped); |
0029b0259426
(Fdefine_key): Allow symbol as KEY argument for
Kim F. Storm <storm@cua.dk>
parents:
42510
diff
changeset
|
2575 goto record_sequence; |
0029b0259426
(Fdefine_key): Allow symbol as KEY argument for
Kim F. Storm <storm@cua.dk>
parents:
42510
diff
changeset
|
2576 } |
250 | 2577 } |
2578 } | |
2579 } | |
2727
b8911c8b9700
* keymap.c (Fwhere_is_internal): If FIRSTONLY is non-nil, avoid
Jim Blandy <jimb@redhat.com>
parents:
2652
diff
changeset
|
2580 |
7998
d4b5f4dd9c51
(Flookup_key): Add gcpro.
Richard M. Stallman <rms@gnu.org>
parents:
7894
diff
changeset
|
2581 UNGCPRO; |
d4b5f4dd9c51
(Flookup_key): Add gcpro.
Richard M. Stallman <rms@gnu.org>
parents:
7894
diff
changeset
|
2582 |
2727
b8911c8b9700
* keymap.c (Fwhere_is_internal): If FIRSTONLY is non-nil, avoid
Jim Blandy <jimb@redhat.com>
parents:
2652
diff
changeset
|
2583 found = Fnreverse (found); |
b8911c8b9700
* keymap.c (Fwhere_is_internal): If FIRSTONLY is non-nil, avoid
Jim Blandy <jimb@redhat.com>
parents:
2652
diff
changeset
|
2584 |
b8911c8b9700
* keymap.c (Fwhere_is_internal): If FIRSTONLY is non-nil, avoid
Jim Blandy <jimb@redhat.com>
parents:
2652
diff
changeset
|
2585 /* firstonly may have been t, but we may have gone all the way through |
b8911c8b9700
* keymap.c (Fwhere_is_internal): If FIRSTONLY is non-nil, avoid
Jim Blandy <jimb@redhat.com>
parents:
2652
diff
changeset
|
2586 the keymaps without finding an all-ASCII key sequence. So just |
b8911c8b9700
* keymap.c (Fwhere_is_internal): If FIRSTONLY is non-nil, avoid
Jim Blandy <jimb@redhat.com>
parents:
2652
diff
changeset
|
2587 return the best we could find. */ |
39689
0572449a62be
(Fkeymap_prompt, Fcurrent_active_maps): New funs.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
39682
diff
changeset
|
2588 if (!NILP (firstonly)) |
2727
b8911c8b9700
* keymap.c (Fwhere_is_internal): If FIRSTONLY is non-nil, avoid
Jim Blandy <jimb@redhat.com>
parents:
2652
diff
changeset
|
2589 return Fcar (found); |
45279
220c13a65624
(keymap_parent): New fun, extracted from Fkeymap_parent.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
45235
diff
changeset
|
2590 |
2727
b8911c8b9700
* keymap.c (Fwhere_is_internal): If FIRSTONLY is non-nil, avoid
Jim Blandy <jimb@redhat.com>
parents:
2652
diff
changeset
|
2591 return found; |
250 | 2592 } |
17788
208d71ea3a4f
(get_keyelt): Handle an indirect entry with meta char.
Richard M. Stallman <rms@gnu.org>
parents:
17511
diff
changeset
|
2593 |
43152
0029b0259426
(Fdefine_key): Allow symbol as KEY argument for
Kim F. Storm <storm@cua.dk>
parents:
42510
diff
changeset
|
2594 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
|
2595 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
|
2596 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
|
2597 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
|
2598 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
|
2599 |
a17c8b15ef1b
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
40804
diff
changeset
|
2600 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
|
2601 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
|
2602 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
|
2603 no matter what it is. |
56635
a8be0bc345d2
(Fmake_keymap, Fmap_keymap, Fwhere_is_internal): Doc fixes.
Luc Teirlinck <teirllm@auburn.edu>
parents:
56618
diff
changeset
|
2604 If FIRSTONLY has another non-nil value, prefer sequences of ASCII characters |
a8be0bc345d2
(Fmake_keymap, Fmap_keymap, Fwhere_is_internal): Doc fixes.
Luc Teirlinck <teirllm@auburn.edu>
parents:
56618
diff
changeset
|
2605 \(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
|
2606 |
a17c8b15ef1b
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
40804
diff
changeset
|
2607 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
|
2608 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
|
2609 indirect definition itself. |
0029b0259426
(Fdefine_key): Allow symbol as KEY argument for
Kim F. Storm <storm@cua.dk>
parents:
42510
diff
changeset
|
2610 |
0029b0259426
(Fdefine_key): Allow symbol as KEY argument for
Kim F. Storm <storm@cua.dk>
parents:
42510
diff
changeset
|
2611 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
|
2612 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
|
2613 remapped command in the returned list. */) |
0029b0259426
(Fdefine_key): Allow symbol as KEY argument for
Kim F. Storm <storm@cua.dk>
parents:
42510
diff
changeset
|
2614 (definition, keymap, firstonly, noindirect, no_remap) |
35258
f585b46c055a
Call get_local_map with new argument list.
Gerd Moellmann <gerd@gnu.org>
parents:
34906
diff
changeset
|
2615 Lisp_Object definition, keymap; |
43152
0029b0259426
(Fdefine_key): Allow symbol as KEY argument for
Kim F. Storm <storm@cua.dk>
parents:
42510
diff
changeset
|
2616 Lisp_Object firstonly, noindirect, no_remap; |
32889
673e3ef1f7f6
(where_is_cache, where_is_cache_keymaps): New vars.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
32846
diff
changeset
|
2617 { |
673e3ef1f7f6
(where_is_cache, where_is_cache_keymaps): New vars.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
32846
diff
changeset
|
2618 Lisp_Object sequences, keymaps; |
673e3ef1f7f6
(where_is_cache, where_is_cache_keymaps): New vars.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
32846
diff
changeset
|
2619 /* 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
|
2620 int nomenus = !NILP (firstonly) && !EQ (firstonly, Qnon_ascii); |
35520
beec07f3fec0
(Fwhere_is_internal): Don't nreverse the cached
Gerd Moellmann <gerd@gnu.org>
parents:
35258
diff
changeset
|
2621 Lisp_Object result; |
32889
673e3ef1f7f6
(where_is_cache, where_is_cache_keymaps): New vars.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
32846
diff
changeset
|
2622 |
673e3ef1f7f6
(where_is_cache, where_is_cache_keymaps): New vars.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
32846
diff
changeset
|
2623 /* Find the relevant keymaps. */ |
35258
f585b46c055a
Call get_local_map with new argument list.
Gerd Moellmann <gerd@gnu.org>
parents:
34906
diff
changeset
|
2624 if (CONSP (keymap) && KEYMAPP (XCAR (keymap))) |
f585b46c055a
Call get_local_map with new argument list.
Gerd Moellmann <gerd@gnu.org>
parents:
34906
diff
changeset
|
2625 keymaps = keymap; |
39689
0572449a62be
(Fkeymap_prompt, Fcurrent_active_maps): New funs.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
39682
diff
changeset
|
2626 else if (!NILP (keymap)) |
35258
f585b46c055a
Call get_local_map with new argument list.
Gerd Moellmann <gerd@gnu.org>
parents:
34906
diff
changeset
|
2627 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
|
2628 else |
39689
0572449a62be
(Fkeymap_prompt, Fcurrent_active_maps): New funs.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
39682
diff
changeset
|
2629 keymaps = Fcurrent_active_maps (Qnil); |
32889
673e3ef1f7f6
(where_is_cache, where_is_cache_keymaps): New vars.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
32846
diff
changeset
|
2630 |
673e3ef1f7f6
(where_is_cache, where_is_cache_keymaps): New vars.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
32846
diff
changeset
|
2631 /* Only use caching for the menubar (i.e. called with (def nil t nil). |
35258
f585b46c055a
Call get_local_map with new argument list.
Gerd Moellmann <gerd@gnu.org>
parents:
34906
diff
changeset
|
2632 We don't really need to check `keymap'. */ |
f585b46c055a
Call get_local_map with new argument list.
Gerd Moellmann <gerd@gnu.org>
parents:
34906
diff
changeset
|
2633 if (nomenus && NILP (noindirect) && NILP (keymap)) |
32889
673e3ef1f7f6
(where_is_cache, where_is_cache_keymaps): New vars.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
32846
diff
changeset
|
2634 { |
35520
beec07f3fec0
(Fwhere_is_internal): Don't nreverse the cached
Gerd Moellmann <gerd@gnu.org>
parents:
35258
diff
changeset
|
2635 Lisp_Object *defns; |
35781
ffdcf20f53f2
(Fwhere_is_internal): Use the first valid binding
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
35706
diff
changeset
|
2636 int i, j, n; |
43152
0029b0259426
(Fdefine_key): Allow symbol as KEY argument for
Kim F. Storm <storm@cua.dk>
parents:
42510
diff
changeset
|
2637 struct gcpro gcpro1, gcpro2, gcpro3, gcpro4, gcpro5; |
45619
dbd65bd8bb4f
(describe_command): Cast `current_column' return value to int.
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
45404
diff
changeset
|
2638 |
32889
673e3ef1f7f6
(where_is_cache, where_is_cache_keymaps): New vars.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
32846
diff
changeset
|
2639 /* Check heuristic-consistency of the cache. */ |
673e3ef1f7f6
(where_is_cache, where_is_cache_keymaps): New vars.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
32846
diff
changeset
|
2640 if (NILP (Fequal (keymaps, where_is_cache_keymaps))) |
673e3ef1f7f6
(where_is_cache, where_is_cache_keymaps): New vars.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
32846
diff
changeset
|
2641 where_is_cache = Qnil; |
673e3ef1f7f6
(where_is_cache, where_is_cache_keymaps): New vars.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
32846
diff
changeset
|
2642 |
673e3ef1f7f6
(where_is_cache, where_is_cache_keymaps): New vars.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
32846
diff
changeset
|
2643 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
|
2644 { |
673e3ef1f7f6
(where_is_cache, where_is_cache_keymaps): New vars.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
32846
diff
changeset
|
2645 /* We need to create the cache. */ |
673e3ef1f7f6
(where_is_cache, where_is_cache_keymaps): New vars.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
32846
diff
changeset
|
2646 Lisp_Object args[2]; |
673e3ef1f7f6
(where_is_cache, where_is_cache_keymaps): New vars.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
32846
diff
changeset
|
2647 where_is_cache = Fmake_hash_table (0, args); |
673e3ef1f7f6
(where_is_cache, where_is_cache_keymaps): New vars.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
32846
diff
changeset
|
2648 where_is_cache_keymaps = Qt; |
45279
220c13a65624
(keymap_parent): New fun, extracted from Fkeymap_parent.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
45235
diff
changeset
|
2649 |
32889
673e3ef1f7f6
(where_is_cache, where_is_cache_keymaps): New vars.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
32846
diff
changeset
|
2650 /* Fill in the cache. */ |
43152
0029b0259426
(Fdefine_key): Allow symbol as KEY argument for
Kim F. Storm <storm@cua.dk>
parents:
42510
diff
changeset
|
2651 GCPRO5 (definition, keymaps, firstonly, noindirect, no_remap); |
0029b0259426
(Fdefine_key): Allow symbol as KEY argument for
Kim F. Storm <storm@cua.dk>
parents:
42510
diff
changeset
|
2652 where_is_internal (definition, keymaps, firstonly, noindirect, no_remap); |
32889
673e3ef1f7f6
(where_is_cache, where_is_cache_keymaps): New vars.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
32846
diff
changeset
|
2653 UNGCPRO; |
673e3ef1f7f6
(where_is_cache, where_is_cache_keymaps): New vars.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
32846
diff
changeset
|
2654 |
673e3ef1f7f6
(where_is_cache, where_is_cache_keymaps): New vars.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
32846
diff
changeset
|
2655 where_is_cache_keymaps = keymaps; |
673e3ef1f7f6
(where_is_cache, where_is_cache_keymaps): New vars.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
32846
diff
changeset
|
2656 } |
673e3ef1f7f6
(where_is_cache, where_is_cache_keymaps): New vars.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
32846
diff
changeset
|
2657 |
35520
beec07f3fec0
(Fwhere_is_internal): Don't nreverse the cached
Gerd Moellmann <gerd@gnu.org>
parents:
35258
diff
changeset
|
2658 /* We want to process definitions from the last to the first. |
beec07f3fec0
(Fwhere_is_internal): Don't nreverse the cached
Gerd Moellmann <gerd@gnu.org>
parents:
35258
diff
changeset
|
2659 Instead of consing, copy definitions to a vector and step |
beec07f3fec0
(Fwhere_is_internal): Don't nreverse the cached
Gerd Moellmann <gerd@gnu.org>
parents:
35258
diff
changeset
|
2660 over that vector. */ |
32889
673e3ef1f7f6
(where_is_cache, where_is_cache_keymaps): New vars.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
32846
diff
changeset
|
2661 sequences = Fgethash (definition, where_is_cache, Qnil); |
36405
7fe1b8d8fc44
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
36373
diff
changeset
|
2662 n = XINT (Flength (sequences)); |
35520
beec07f3fec0
(Fwhere_is_internal): Don't nreverse the cached
Gerd Moellmann <gerd@gnu.org>
parents:
35258
diff
changeset
|
2663 defns = (Lisp_Object *) alloca (n * sizeof *defns); |
beec07f3fec0
(Fwhere_is_internal): Don't nreverse the cached
Gerd Moellmann <gerd@gnu.org>
parents:
35258
diff
changeset
|
2664 for (i = 0; CONSP (sequences); sequences = XCDR (sequences)) |
beec07f3fec0
(Fwhere_is_internal): Don't nreverse the cached
Gerd Moellmann <gerd@gnu.org>
parents:
35258
diff
changeset
|
2665 defns[i++] = XCAR (sequences); |
45279
220c13a65624
(keymap_parent): New fun, extracted from Fkeymap_parent.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
45235
diff
changeset
|
2666 |
35520
beec07f3fec0
(Fwhere_is_internal): Don't nreverse the cached
Gerd Moellmann <gerd@gnu.org>
parents:
35258
diff
changeset
|
2667 /* Verify that the key bindings are not shadowed. Note that |
beec07f3fec0
(Fwhere_is_internal): Don't nreverse the cached
Gerd Moellmann <gerd@gnu.org>
parents:
35258
diff
changeset
|
2668 the following can GC. */ |
beec07f3fec0
(Fwhere_is_internal): Don't nreverse the cached
Gerd Moellmann <gerd@gnu.org>
parents:
35258
diff
changeset
|
2669 GCPRO2 (definition, keymaps); |
beec07f3fec0
(Fwhere_is_internal): Don't nreverse the cached
Gerd Moellmann <gerd@gnu.org>
parents:
35258
diff
changeset
|
2670 result = Qnil; |
35781
ffdcf20f53f2
(Fwhere_is_internal): Use the first valid binding
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
35706
diff
changeset
|
2671 j = -1; |
35520
beec07f3fec0
(Fwhere_is_internal): Don't nreverse the cached
Gerd Moellmann <gerd@gnu.org>
parents:
35258
diff
changeset
|
2672 for (i = n - 1; i >= 0; --i) |
35781
ffdcf20f53f2
(Fwhere_is_internal): Use the first valid binding
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
35706
diff
changeset
|
2673 if (EQ (shadow_lookup (keymaps, defns[i], Qnil), definition)) |
ffdcf20f53f2
(Fwhere_is_internal): Use the first valid binding
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
35706
diff
changeset
|
2674 { |
ffdcf20f53f2
(Fwhere_is_internal): Use the first valid binding
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
35706
diff
changeset
|
2675 if (ascii_sequence_p (defns[i])) |
ffdcf20f53f2
(Fwhere_is_internal): Use the first valid binding
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
35706
diff
changeset
|
2676 break; |
ffdcf20f53f2
(Fwhere_is_internal): Use the first valid binding
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
35706
diff
changeset
|
2677 else if (j < 0) |
ffdcf20f53f2
(Fwhere_is_internal): Use the first valid binding
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
35706
diff
changeset
|
2678 j = i; |
ffdcf20f53f2
(Fwhere_is_internal): Use the first valid binding
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
35706
diff
changeset
|
2679 } |
ffdcf20f53f2
(Fwhere_is_internal): Use the first valid binding
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
35706
diff
changeset
|
2680 |
ffdcf20f53f2
(Fwhere_is_internal): Use the first valid binding
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
35706
diff
changeset
|
2681 result = i >= 0 ? defns[i] : (j >= 0 ? defns[j] : Qnil); |
35520
beec07f3fec0
(Fwhere_is_internal): Don't nreverse the cached
Gerd Moellmann <gerd@gnu.org>
parents:
35258
diff
changeset
|
2682 UNGCPRO; |
32889
673e3ef1f7f6
(where_is_cache, where_is_cache_keymaps): New vars.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
32846
diff
changeset
|
2683 } |
673e3ef1f7f6
(where_is_cache, where_is_cache_keymaps): New vars.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
32846
diff
changeset
|
2684 else |
673e3ef1f7f6
(where_is_cache, where_is_cache_keymaps): New vars.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
32846
diff
changeset
|
2685 { |
673e3ef1f7f6
(where_is_cache, where_is_cache_keymaps): New vars.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
32846
diff
changeset
|
2686 /* Kill the cache so that where_is_internal_1 doesn't think |
673e3ef1f7f6
(where_is_cache, where_is_cache_keymaps): New vars.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
32846
diff
changeset
|
2687 we're filling it up. */ |
673e3ef1f7f6
(where_is_cache, where_is_cache_keymaps): New vars.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
32846
diff
changeset
|
2688 where_is_cache = Qnil; |
43152
0029b0259426
(Fdefine_key): Allow symbol as KEY argument for
Kim F. Storm <storm@cua.dk>
parents:
42510
diff
changeset
|
2689 result = where_is_internal (definition, keymaps, firstonly, noindirect, no_remap); |
32889
673e3ef1f7f6
(where_is_cache, where_is_cache_keymaps): New vars.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
32846
diff
changeset
|
2690 } |
35520
beec07f3fec0
(Fwhere_is_internal): Don't nreverse the cached
Gerd Moellmann <gerd@gnu.org>
parents:
35258
diff
changeset
|
2691 |
beec07f3fec0
(Fwhere_is_internal): Don't nreverse the cached
Gerd Moellmann <gerd@gnu.org>
parents:
35258
diff
changeset
|
2692 return result; |
32889
673e3ef1f7f6
(where_is_cache, where_is_cache_keymaps): New vars.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
32846
diff
changeset
|
2693 } |
673e3ef1f7f6
(where_is_cache, where_is_cache_keymaps): New vars.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
32846
diff
changeset
|
2694 |
17788
208d71ea3a4f
(get_keyelt): Handle an indirect entry with meta char.
Richard M. Stallman <rms@gnu.org>
parents:
17511
diff
changeset
|
2695 /* This is the function that Fwhere_is_internal calls using map_char_table. |
208d71ea3a4f
(get_keyelt): Handle an indirect entry with meta char.
Richard M. Stallman <rms@gnu.org>
parents:
17511
diff
changeset
|
2696 ARGS has the form |
208d71ea3a4f
(get_keyelt): Handle an indirect entry with meta char.
Richard M. Stallman <rms@gnu.org>
parents:
17511
diff
changeset
|
2697 (((DEFINITION . NOINDIRECT) . (KEYMAP . RESULT)) |
208d71ea3a4f
(get_keyelt): Handle an indirect entry with meta char.
Richard M. Stallman <rms@gnu.org>
parents:
17511
diff
changeset
|
2698 . |
208d71ea3a4f
(get_keyelt): Handle an indirect entry with meta char.
Richard M. Stallman <rms@gnu.org>
parents:
17511
diff
changeset
|
2699 ((THIS . LAST) . (NOMENUS . LAST_IS_META))) |
208d71ea3a4f
(get_keyelt): Handle an indirect entry with meta char.
Richard M. Stallman <rms@gnu.org>
parents:
17511
diff
changeset
|
2700 Since map_char_table doesn't really use the return value from this function, |
30134
784ef95b020b
(get_keymap_1): Add comment that this function can GC.
Gerd Moellmann <gerd@gnu.org>
parents:
30030
diff
changeset
|
2701 we the result append to RESULT, the slot in ARGS. |
784ef95b020b
(get_keymap_1): Add comment that this function can GC.
Gerd Moellmann <gerd@gnu.org>
parents:
30030
diff
changeset
|
2702 |
784ef95b020b
(get_keymap_1): Add comment that this function can GC.
Gerd Moellmann <gerd@gnu.org>
parents:
30030
diff
changeset
|
2703 This function can GC because it calls where_is_internal_1 which can |
784ef95b020b
(get_keymap_1): Add comment that this function can GC.
Gerd Moellmann <gerd@gnu.org>
parents:
30030
diff
changeset
|
2704 GC. */ |
17788
208d71ea3a4f
(get_keyelt): Handle an indirect entry with meta char.
Richard M. Stallman <rms@gnu.org>
parents:
17511
diff
changeset
|
2705 |
20319
81424cf4d446
(copy_keymap_1): Fix return type.
Andreas Schwab <schwab@suse.de>
parents:
20076
diff
changeset
|
2706 static void |
17788
208d71ea3a4f
(get_keyelt): Handle an indirect entry with meta char.
Richard M. Stallman <rms@gnu.org>
parents:
17511
diff
changeset
|
2707 where_is_internal_2 (args, key, binding) |
208d71ea3a4f
(get_keyelt): Handle an indirect entry with meta char.
Richard M. Stallman <rms@gnu.org>
parents:
17511
diff
changeset
|
2708 Lisp_Object args, key, binding; |
208d71ea3a4f
(get_keyelt): Handle an indirect entry with meta char.
Richard M. Stallman <rms@gnu.org>
parents:
17511
diff
changeset
|
2709 { |
32846
c1b3ab2a1ccc
Use AREF, ASET and ASIZE macros.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
32844
diff
changeset
|
2710 Lisp_Object definition, noindirect, this, last; |
17788
208d71ea3a4f
(get_keyelt): Handle an indirect entry with meta char.
Richard M. Stallman <rms@gnu.org>
parents:
17511
diff
changeset
|
2711 Lisp_Object result, sequence; |
208d71ea3a4f
(get_keyelt): Handle an indirect entry with meta char.
Richard M. Stallman <rms@gnu.org>
parents:
17511
diff
changeset
|
2712 int nomenus, last_is_meta; |
30134
784ef95b020b
(get_keymap_1): Add comment that this function can GC.
Gerd Moellmann <gerd@gnu.org>
parents:
30030
diff
changeset
|
2713 struct gcpro gcpro1, gcpro2, gcpro3; |
784ef95b020b
(get_keymap_1): Add comment that this function can GC.
Gerd Moellmann <gerd@gnu.org>
parents:
30030
diff
changeset
|
2714 |
784ef95b020b
(get_keymap_1): Add comment that this function can GC.
Gerd Moellmann <gerd@gnu.org>
parents:
30030
diff
changeset
|
2715 GCPRO3 (args, key, binding); |
32846
c1b3ab2a1ccc
Use AREF, ASET and ASIZE macros.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
32844
diff
changeset
|
2716 result = XCDR (XCAR (args)); |
25662
0a7261c1d487
Use XCAR, XCDR, and XFLOAT_DATA instead of explicit member access.
Ken Raeburn <raeburn@raeburn.org>
parents:
25600
diff
changeset
|
2717 definition = XCAR (XCAR (XCAR (args))); |
0a7261c1d487
Use XCAR, XCDR, and XFLOAT_DATA instead of explicit member access.
Ken Raeburn <raeburn@raeburn.org>
parents:
25600
diff
changeset
|
2718 noindirect = XCDR (XCAR (XCAR (args))); |
0a7261c1d487
Use XCAR, XCDR, and XFLOAT_DATA instead of explicit member access.
Ken Raeburn <raeburn@raeburn.org>
parents:
25600
diff
changeset
|
2719 this = XCAR (XCAR (XCDR (args))); |
0a7261c1d487
Use XCAR, XCDR, and XFLOAT_DATA instead of explicit member access.
Ken Raeburn <raeburn@raeburn.org>
parents:
25600
diff
changeset
|
2720 last = XCDR (XCAR (XCDR (args))); |
0a7261c1d487
Use XCAR, XCDR, and XFLOAT_DATA instead of explicit member access.
Ken Raeburn <raeburn@raeburn.org>
parents:
25600
diff
changeset
|
2721 nomenus = XFASTINT (XCAR (XCDR (XCDR (args)))); |
0a7261c1d487
Use XCAR, XCDR, and XFLOAT_DATA instead of explicit member access.
Ken Raeburn <raeburn@raeburn.org>
parents:
25600
diff
changeset
|
2722 last_is_meta = XFASTINT (XCDR (XCDR (XCDR (args)))); |
17788
208d71ea3a4f
(get_keyelt): Handle an indirect entry with meta char.
Richard M. Stallman <rms@gnu.org>
parents:
17511
diff
changeset
|
2723 |
32846
c1b3ab2a1ccc
Use AREF, ASET and ASIZE macros.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
32844
diff
changeset
|
2724 sequence = where_is_internal_1 (binding, key, definition, noindirect, |
17788
208d71ea3a4f
(get_keyelt): Handle an indirect entry with meta char.
Richard M. Stallman <rms@gnu.org>
parents:
17511
diff
changeset
|
2725 this, last, nomenus, last_is_meta); |
208d71ea3a4f
(get_keyelt): Handle an indirect entry with meta char.
Richard M. Stallman <rms@gnu.org>
parents:
17511
diff
changeset
|
2726 |
208d71ea3a4f
(get_keyelt): Handle an indirect entry with meta char.
Richard M. Stallman <rms@gnu.org>
parents:
17511
diff
changeset
|
2727 if (!NILP (sequence)) |
39973
579177964efa
Avoid (most) uses of XCAR/XCDR as lvalues, for flexibility in experimenting
Ken Raeburn <raeburn@raeburn.org>
parents:
39940
diff
changeset
|
2728 XSETCDR (XCAR (args), Fcons (sequence, result)); |
30134
784ef95b020b
(get_keymap_1): Add comment that this function can GC.
Gerd Moellmann <gerd@gnu.org>
parents:
30030
diff
changeset
|
2729 |
784ef95b020b
(get_keymap_1): Add comment that this function can GC.
Gerd Moellmann <gerd@gnu.org>
parents:
30030
diff
changeset
|
2730 UNGCPRO; |
17788
208d71ea3a4f
(get_keyelt): Handle an indirect entry with meta char.
Richard M. Stallman <rms@gnu.org>
parents:
17511
diff
changeset
|
2731 } |
208d71ea3a4f
(get_keyelt): Handle an indirect entry with meta char.
Richard M. Stallman <rms@gnu.org>
parents:
17511
diff
changeset
|
2732 |
30134
784ef95b020b
(get_keymap_1): Add comment that this function can GC.
Gerd Moellmann <gerd@gnu.org>
parents:
30030
diff
changeset
|
2733 |
32846
c1b3ab2a1ccc
Use AREF, ASET and ASIZE macros.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
32844
diff
changeset
|
2734 /* This function cannot GC. */ |
30134
784ef95b020b
(get_keymap_1): Add comment that this function can GC.
Gerd Moellmann <gerd@gnu.org>
parents:
30030
diff
changeset
|
2735 |
17788
208d71ea3a4f
(get_keyelt): Handle an indirect entry with meta char.
Richard M. Stallman <rms@gnu.org>
parents:
17511
diff
changeset
|
2736 static Lisp_Object |
32846
c1b3ab2a1ccc
Use AREF, ASET and ASIZE macros.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
32844
diff
changeset
|
2737 where_is_internal_1 (binding, key, definition, noindirect, this, last, |
17788
208d71ea3a4f
(get_keyelt): Handle an indirect entry with meta char.
Richard M. Stallman <rms@gnu.org>
parents:
17511
diff
changeset
|
2738 nomenus, last_is_meta) |
32846
c1b3ab2a1ccc
Use AREF, ASET and ASIZE macros.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
32844
diff
changeset
|
2739 Lisp_Object binding, key, definition, noindirect, this, last; |
17788
208d71ea3a4f
(get_keyelt): Handle an indirect entry with meta char.
Richard M. Stallman <rms@gnu.org>
parents:
17511
diff
changeset
|
2740 int nomenus, last_is_meta; |
208d71ea3a4f
(get_keyelt): Handle an indirect entry with meta char.
Richard M. Stallman <rms@gnu.org>
parents:
17511
diff
changeset
|
2741 { |
208d71ea3a4f
(get_keyelt): Handle an indirect entry with meta char.
Richard M. Stallman <rms@gnu.org>
parents:
17511
diff
changeset
|
2742 Lisp_Object sequence; |
208d71ea3a4f
(get_keyelt): Handle an indirect entry with meta char.
Richard M. Stallman <rms@gnu.org>
parents:
17511
diff
changeset
|
2743 |
208d71ea3a4f
(get_keyelt): Handle an indirect entry with meta char.
Richard M. Stallman <rms@gnu.org>
parents:
17511
diff
changeset
|
2744 /* Search through indirections unless that's not wanted. */ |
208d71ea3a4f
(get_keyelt): Handle an indirect entry with meta char.
Richard M. Stallman <rms@gnu.org>
parents:
17511
diff
changeset
|
2745 if (NILP (noindirect)) |
32145
a48fcf036df1
(Fwhere_is_internal): Ignore `menu-bar' and `tool-bar'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
32038
diff
changeset
|
2746 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
|
2747 |
208d71ea3a4f
(get_keyelt): Handle an indirect entry with meta char.
Richard M. Stallman <rms@gnu.org>
parents:
17511
diff
changeset
|
2748 /* 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
|
2749 the target. */ |
208d71ea3a4f
(get_keyelt): Handle an indirect entry with meta char.
Richard M. Stallman <rms@gnu.org>
parents:
17511
diff
changeset
|
2750 |
32889
673e3ef1f7f6
(where_is_cache, where_is_cache_keymaps): New vars.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
32846
diff
changeset
|
2751 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
|
2752 || EQ (binding, definition) |
673e3ef1f7f6
(where_is_cache, where_is_cache_keymaps): New vars.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
32846
diff
changeset
|
2753 || (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
|
2754 /* Doesn't match. */ |
673e3ef1f7f6
(where_is_cache, where_is_cache_keymaps): New vars.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
32846
diff
changeset
|
2755 return Qnil; |
673e3ef1f7f6
(where_is_cache, where_is_cache_keymaps): New vars.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
32846
diff
changeset
|
2756 |
673e3ef1f7f6
(where_is_cache, where_is_cache_keymaps): New vars.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
32846
diff
changeset
|
2757 /* 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
|
2758 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
|
2759 { |
208d71ea3a4f
(get_keyelt): Handle an indirect entry with meta char.
Richard M. Stallman <rms@gnu.org>
parents:
17511
diff
changeset
|
2760 sequence = Fcopy_sequence (this); |
208d71ea3a4f
(get_keyelt): Handle an indirect entry with meta char.
Richard M. Stallman <rms@gnu.org>
parents:
17511
diff
changeset
|
2761 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
|
2762 } |
208d71ea3a4f
(get_keyelt): Handle an indirect entry with meta char.
Richard M. Stallman <rms@gnu.org>
parents:
17511
diff
changeset
|
2763 else |
208d71ea3a4f
(get_keyelt): Handle an indirect entry with meta char.
Richard M. Stallman <rms@gnu.org>
parents:
17511
diff
changeset
|
2764 sequence = append_key (this, key); |
208d71ea3a4f
(get_keyelt): Handle an indirect entry with meta char.
Richard M. Stallman <rms@gnu.org>
parents:
17511
diff
changeset
|
2765 |
32889
673e3ef1f7f6
(where_is_cache, where_is_cache_keymaps): New vars.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
32846
diff
changeset
|
2766 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
|
2767 { |
673e3ef1f7f6
(where_is_cache, where_is_cache_keymaps): New vars.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
32846
diff
changeset
|
2768 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
|
2769 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
|
2770 return Qnil; |
673e3ef1f7f6
(where_is_cache, where_is_cache_keymaps): New vars.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
32846
diff
changeset
|
2771 } |
673e3ef1f7f6
(where_is_cache, where_is_cache_keymaps): New vars.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
32846
diff
changeset
|
2772 else |
673e3ef1f7f6
(where_is_cache, where_is_cache_keymaps): New vars.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
32846
diff
changeset
|
2773 return sequence; |
17788
208d71ea3a4f
(get_keyelt): Handle an indirect entry with meta char.
Richard M. Stallman <rms@gnu.org>
parents:
17511
diff
changeset
|
2774 } |
250 | 2775 |
465 | 2776 /* describe-bindings - summarizing all the bindings in a set of keymaps. */ |
2777 | |
39689
0572449a62be
(Fkeymap_prompt, Fcurrent_active_maps): New funs.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
39682
diff
changeset
|
2778 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
|
2779 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
|
2780 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
|
2781 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
|
2782 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
|
2783 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
|
2784 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
|
2785 \(Ordinarily these are omitted from the output.) */) |
a17c8b15ef1b
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
40804
diff
changeset
|
2786 (buffer, prefix, menus) |
39689
0572449a62be
(Fkeymap_prompt, Fcurrent_active_maps): New funs.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
39682
diff
changeset
|
2787 Lisp_Object buffer, prefix, menus; |
250 | 2788 { |
39689
0572449a62be
(Fkeymap_prompt, Fcurrent_active_maps): New funs.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
39682
diff
changeset
|
2789 Lisp_Object outbuf, shadow; |
0572449a62be
(Fkeymap_prompt, Fcurrent_active_maps): New funs.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
39682
diff
changeset
|
2790 int nomenu = NILP (menus); |
7186
092688f7ebbb
(describe_buffer_bindings): gcpro stuff. Delete some unused code.
Karl Heuer <kwzh@gnu.org>
parents:
7184
diff
changeset
|
2791 register Lisp_Object start1; |
092688f7ebbb
(describe_buffer_bindings): gcpro stuff. Delete some unused code.
Karl Heuer <kwzh@gnu.org>
parents:
7184
diff
changeset
|
2792 struct gcpro gcpro1; |
250 | 2793 |
1120
0a486e1a45bc
* keymap.c (describe_buffer_bindings): Adjust key_heading to match
Jim Blandy <jimb@redhat.com>
parents:
1095
diff
changeset
|
2794 char *alternate_heading |
0a486e1a45bc
* keymap.c (describe_buffer_bindings): Adjust key_heading to match
Jim Blandy <jimb@redhat.com>
parents:
1095
diff
changeset
|
2795 = "\ |
20850
ffbaaba0bf76
(Fdescribe_bindings_internal):
Richard M. Stallman <rms@gnu.org>
parents:
20708
diff
changeset
|
2796 Keyboard translations:\n\n\ |
ffbaaba0bf76
(Fdescribe_bindings_internal):
Richard M. Stallman <rms@gnu.org>
parents:
20708
diff
changeset
|
2797 You type Translation\n\ |
ffbaaba0bf76
(Fdescribe_bindings_internal):
Richard M. Stallman <rms@gnu.org>
parents:
20708
diff
changeset
|
2798 -------- -----------\n"; |
250 | 2799 |
4575
bf0f07186369
(describe_buffer_bindings): Declare shadow just once.
Richard M. Stallman <rms@gnu.org>
parents:
4138
diff
changeset
|
2800 shadow = Qnil; |
7186
092688f7ebbb
(describe_buffer_bindings): gcpro stuff. Delete some unused code.
Karl Heuer <kwzh@gnu.org>
parents:
7184
diff
changeset
|
2801 GCPRO1 (shadow); |
3952
f9dfc2872fb0
(describe_map_tree): Insert key_heading here.
Richard M. Stallman <rms@gnu.org>
parents:
3908
diff
changeset
|
2802 |
40625
1248b61b7baf
(Fdescribe_buffer_bindings): Print character property
Richard M. Stallman <rms@gnu.org>
parents:
40401
diff
changeset
|
2803 outbuf = Fcurrent_buffer (); |
250 | 2804 |
1120
0a486e1a45bc
* keymap.c (describe_buffer_bindings): Adjust key_heading to match
Jim Blandy <jimb@redhat.com>
parents:
1095
diff
changeset
|
2805 /* Report on alternates for keys. */ |
12710
26c09987d2f3
(describe_buffer_bindings): Print bindings from
Richard M. Stallman <rms@gnu.org>
parents:
12542
diff
changeset
|
2806 if (STRINGP (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
|
2807 { |
0a486e1a45bc
* keymap.c (describe_buffer_bindings): Adjust key_heading to match
Jim Blandy <jimb@redhat.com>
parents:
1095
diff
changeset
|
2808 int c; |
46470
00b425333e0d
(Fdescribe_buffer_bindings): Use const for pointer to
Ken Raeburn <raeburn@raeburn.org>
parents:
46370
diff
changeset
|
2809 const unsigned char *translate = SDATA (Vkeyboard_translate_table); |
46370
40db0673e6f0
Most uses of XSTRING combined with STRING_BYTES or indirection changed to
Ken Raeburn <raeburn@raeburn.org>
parents:
46310
diff
changeset
|
2810 int translate_len = SCHARS (Vkeyboard_translate_table); |
1120
0a486e1a45bc
* keymap.c (describe_buffer_bindings): Adjust key_heading to match
Jim Blandy <jimb@redhat.com>
parents:
1095
diff
changeset
|
2811 |
0a486e1a45bc
* keymap.c (describe_buffer_bindings): Adjust key_heading to match
Jim Blandy <jimb@redhat.com>
parents:
1095
diff
changeset
|
2812 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
|
2813 if (translate[c] != c) |
0a486e1a45bc
* keymap.c (describe_buffer_bindings): Adjust key_heading to match
Jim Blandy <jimb@redhat.com>
parents:
1095
diff
changeset
|
2814 { |
26481
70d85ae6dfee
(Fsingle_key_description): Use KEY_DESCRIPTION_SIZE to
Kenichi Handa <handa@m17n.org>
parents:
26404
diff
changeset
|
2815 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
|
2816 char *bufend; |
0a486e1a45bc
* keymap.c (describe_buffer_bindings): Adjust key_heading to match
Jim Blandy <jimb@redhat.com>
parents:
1095
diff
changeset
|
2817 |
0a486e1a45bc
* keymap.c (describe_buffer_bindings): Adjust key_heading to match
Jim Blandy <jimb@redhat.com>
parents:
1095
diff
changeset
|
2818 if (alternate_heading) |
0a486e1a45bc
* keymap.c (describe_buffer_bindings): Adjust key_heading to match
Jim Blandy <jimb@redhat.com>
parents:
1095
diff
changeset
|
2819 { |
0a486e1a45bc
* keymap.c (describe_buffer_bindings): Adjust key_heading to match
Jim Blandy <jimb@redhat.com>
parents:
1095
diff
changeset
|
2820 insert_string (alternate_heading); |
0a486e1a45bc
* keymap.c (describe_buffer_bindings): Adjust key_heading to match
Jim Blandy <jimb@redhat.com>
parents:
1095
diff
changeset
|
2821 alternate_heading = 0; |
0a486e1a45bc
* keymap.c (describe_buffer_bindings): Adjust key_heading to match
Jim Blandy <jimb@redhat.com>
parents:
1095
diff
changeset
|
2822 } |
0a486e1a45bc
* keymap.c (describe_buffer_bindings): Adjust key_heading to match
Jim Blandy <jimb@redhat.com>
parents:
1095
diff
changeset
|
2823 |
34906
333a490b6ebc
(push_key_description): Add parameter FORCE_MULTIBYTE.
Gerd Moellmann <gerd@gnu.org>
parents:
34765
diff
changeset
|
2824 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
|
2825 insert (buf, bufend - buf); |
0a486e1a45bc
* keymap.c (describe_buffer_bindings): Adjust key_heading to match
Jim Blandy <jimb@redhat.com>
parents:
1095
diff
changeset
|
2826 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
|
2827 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
|
2828 insert (buf, bufend - buf); |
0a486e1a45bc
* keymap.c (describe_buffer_bindings): Adjust key_heading to match
Jim Blandy <jimb@redhat.com>
parents:
1095
diff
changeset
|
2829 |
0a486e1a45bc
* keymap.c (describe_buffer_bindings): Adjust key_heading to match
Jim Blandy <jimb@redhat.com>
parents:
1095
diff
changeset
|
2830 insert ("\n", 1); |
0a486e1a45bc
* keymap.c (describe_buffer_bindings): Adjust key_heading to match
Jim Blandy <jimb@redhat.com>
parents:
1095
diff
changeset
|
2831 } |
0a486e1a45bc
* keymap.c (describe_buffer_bindings): Adjust key_heading to match
Jim Blandy <jimb@redhat.com>
parents:
1095
diff
changeset
|
2832 |
0a486e1a45bc
* keymap.c (describe_buffer_bindings): Adjust key_heading to match
Jim Blandy <jimb@redhat.com>
parents:
1095
diff
changeset
|
2833 insert ("\n", 1); |
0a486e1a45bc
* keymap.c (describe_buffer_bindings): Adjust key_heading to match
Jim Blandy <jimb@redhat.com>
parents:
1095
diff
changeset
|
2834 } |
0a486e1a45bc
* keymap.c (describe_buffer_bindings): Adjust key_heading to match
Jim Blandy <jimb@redhat.com>
parents:
1095
diff
changeset
|
2835 |
12710
26c09987d2f3
(describe_buffer_bindings): Print bindings from
Richard M. Stallman <rms@gnu.org>
parents:
12542
diff
changeset
|
2836 if (!NILP (Vkey_translation_map)) |
26c09987d2f3
(describe_buffer_bindings): Print bindings from
Richard M. Stallman <rms@gnu.org>
parents:
12542
diff
changeset
|
2837 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
|
2838 "Key translations", nomenu, 1, 0, 0); |
12710
26c09987d2f3
(describe_buffer_bindings): Print bindings from
Richard M. Stallman <rms@gnu.org>
parents:
12542
diff
changeset
|
2839 |
465 | 2840 |
3952
f9dfc2872fb0
(describe_map_tree): Insert key_heading here.
Richard M. Stallman <rms@gnu.org>
parents:
3908
diff
changeset
|
2841 /* Print the (major mode) local map. */ |
40625
1248b61b7baf
(Fdescribe_buffer_bindings): Print character property
Richard M. Stallman <rms@gnu.org>
parents:
40401
diff
changeset
|
2842 start1 = Qnil; |
12262
a7d5578ebb25
(Fkey_binding, describe_buffer_bindings):
Karl Heuer <kwzh@gnu.org>
parents:
12151
diff
changeset
|
2843 if (!NILP (current_kboard->Voverriding_terminal_local_map)) |
a7d5578ebb25
(Fkey_binding, describe_buffer_bindings):
Karl Heuer <kwzh@gnu.org>
parents:
12151
diff
changeset
|
2844 start1 = current_kboard->Voverriding_terminal_local_map; |
a7d5578ebb25
(Fkey_binding, describe_buffer_bindings):
Karl Heuer <kwzh@gnu.org>
parents:
12151
diff
changeset
|
2845 else if (!NILP (Voverriding_local_map)) |
5613
cad51b2de6cd
(Fkey_binding): Handle Voverriding_local_map.
Richard M. Stallman <rms@gnu.org>
parents:
5551
diff
changeset
|
2846 start1 = Voverriding_local_map; |
cad51b2de6cd
(Fkey_binding): Handle Voverriding_local_map.
Richard M. Stallman <rms@gnu.org>
parents:
5551
diff
changeset
|
2847 |
485 | 2848 if (!NILP (start1)) |
250 | 2849 { |
16465
398e3995162d
(describe_buffer_bindings): Pass 1 for PARTIAL
Richard M. Stallman <rms@gnu.org>
parents:
16227
diff
changeset
|
2850 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
|
2851 "\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
|
2852 shadow = Fcons (start1, shadow); |
250 | 2853 } |
40625
1248b61b7baf
(Fdescribe_buffer_bindings): Print character property
Richard M. Stallman <rms@gnu.org>
parents:
40401
diff
changeset
|
2854 else |
1248b61b7baf
(Fdescribe_buffer_bindings): Print character property
Richard M. Stallman <rms@gnu.org>
parents:
40401
diff
changeset
|
2855 { |
1248b61b7baf
(Fdescribe_buffer_bindings): Print character property
Richard M. Stallman <rms@gnu.org>
parents:
40401
diff
changeset
|
2856 /* 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
|
2857 int i, nmaps; |
1248b61b7baf
(Fdescribe_buffer_bindings): Print character property
Richard M. Stallman <rms@gnu.org>
parents:
40401
diff
changeset
|
2858 Lisp_Object *modes, *maps; |
1248b61b7baf
(Fdescribe_buffer_bindings): Print character property
Richard M. Stallman <rms@gnu.org>
parents:
40401
diff
changeset
|
2859 |
1248b61b7baf
(Fdescribe_buffer_bindings): Print character property
Richard M. Stallman <rms@gnu.org>
parents:
40401
diff
changeset
|
2860 /* 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
|
2861 minor modes correctly. */ |
1248b61b7baf
(Fdescribe_buffer_bindings): Print character property
Richard M. Stallman <rms@gnu.org>
parents:
40401
diff
changeset
|
2862 Fset_buffer (buffer); |
1248b61b7baf
(Fdescribe_buffer_bindings): Print character property
Richard M. Stallman <rms@gnu.org>
parents:
40401
diff
changeset
|
2863 |
1248b61b7baf
(Fdescribe_buffer_bindings): Print character property
Richard M. Stallman <rms@gnu.org>
parents:
40401
diff
changeset
|
2864 nmaps = current_minor_maps (&modes, &maps); |
1248b61b7baf
(Fdescribe_buffer_bindings): Print character property
Richard M. Stallman <rms@gnu.org>
parents:
40401
diff
changeset
|
2865 Fset_buffer (outbuf); |
1248b61b7baf
(Fdescribe_buffer_bindings): Print character property
Richard M. Stallman <rms@gnu.org>
parents:
40401
diff
changeset
|
2866 |
42510
dde71e46eeeb
(Fcurrent_active_maps): Put the `keymap' property map first.
Richard M. Stallman <rms@gnu.org>
parents:
42404
diff
changeset
|
2867 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
|
2868 XBUFFER (buffer), Qkeymap); |
dde71e46eeeb
(Fcurrent_active_maps): Put the `keymap' property map first.
Richard M. Stallman <rms@gnu.org>
parents:
42404
diff
changeset
|
2869 if (!NILP (start1)) |
dde71e46eeeb
(Fcurrent_active_maps): Put the `keymap' property map first.
Richard M. Stallman <rms@gnu.org>
parents:
42404
diff
changeset
|
2870 { |
dde71e46eeeb
(Fcurrent_active_maps): Put the `keymap' property map first.
Richard M. Stallman <rms@gnu.org>
parents:
42404
diff
changeset
|
2871 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
|
2872 "\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
|
2873 0, 0, 0); |
42510
dde71e46eeeb
(Fcurrent_active_maps): Put the `keymap' property map first.
Richard M. Stallman <rms@gnu.org>
parents:
42404
diff
changeset
|
2874 shadow = Fcons (start1, shadow); |
dde71e46eeeb
(Fcurrent_active_maps): Put the `keymap' property map first.
Richard M. Stallman <rms@gnu.org>
parents:
42404
diff
changeset
|
2875 } |
dde71e46eeeb
(Fcurrent_active_maps): Put the `keymap' property map first.
Richard M. Stallman <rms@gnu.org>
parents:
42404
diff
changeset
|
2876 |
40625
1248b61b7baf
(Fdescribe_buffer_bindings): Print character property
Richard M. Stallman <rms@gnu.org>
parents:
40401
diff
changeset
|
2877 /* Print the minor mode maps. */ |
1248b61b7baf
(Fdescribe_buffer_bindings): Print character property
Richard M. Stallman <rms@gnu.org>
parents:
40401
diff
changeset
|
2878 for (i = 0; i < nmaps; i++) |
1248b61b7baf
(Fdescribe_buffer_bindings): Print character property
Richard M. Stallman <rms@gnu.org>
parents:
40401
diff
changeset
|
2879 { |
1248b61b7baf
(Fdescribe_buffer_bindings): Print character property
Richard M. Stallman <rms@gnu.org>
parents:
40401
diff
changeset
|
2880 /* The title for a minor mode keymap |
1248b61b7baf
(Fdescribe_buffer_bindings): Print character property
Richard M. Stallman <rms@gnu.org>
parents:
40401
diff
changeset
|
2881 is constructed at run time. |
1248b61b7baf
(Fdescribe_buffer_bindings): Print character property
Richard M. Stallman <rms@gnu.org>
parents:
40401
diff
changeset
|
2882 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
|
2883 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
|
2884 char *title, *p; |
1248b61b7baf
(Fdescribe_buffer_bindings): Print character property
Richard M. Stallman <rms@gnu.org>
parents:
40401
diff
changeset
|
2885 |
1248b61b7baf
(Fdescribe_buffer_bindings): Print character property
Richard M. Stallman <rms@gnu.org>
parents:
40401
diff
changeset
|
2886 if (!SYMBOLP (modes[i])) |
1248b61b7baf
(Fdescribe_buffer_bindings): Print character property
Richard M. Stallman <rms@gnu.org>
parents:
40401
diff
changeset
|
2887 abort(); |
1248b61b7baf
(Fdescribe_buffer_bindings): Print character property
Richard M. Stallman <rms@gnu.org>
parents:
40401
diff
changeset
|
2888 |
46370
40db0673e6f0
Most uses of XSTRING combined with STRING_BYTES or indirection changed to
Ken Raeburn <raeburn@raeburn.org>
parents:
46310
diff
changeset
|
2889 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
|
2890 *p++ = '\f'; |
1248b61b7baf
(Fdescribe_buffer_bindings): Print character property
Richard M. Stallman <rms@gnu.org>
parents:
40401
diff
changeset
|
2891 *p++ = '\n'; |
1248b61b7baf
(Fdescribe_buffer_bindings): Print character property
Richard M. Stallman <rms@gnu.org>
parents:
40401
diff
changeset
|
2892 *p++ = '`'; |
46370
40db0673e6f0
Most uses of XSTRING combined with STRING_BYTES or indirection changed to
Ken Raeburn <raeburn@raeburn.org>
parents:
46310
diff
changeset
|
2893 bcopy (SDATA (SYMBOL_NAME (modes[i])), p, |
40db0673e6f0
Most uses of XSTRING combined with STRING_BYTES or indirection changed to
Ken Raeburn <raeburn@raeburn.org>
parents:
46310
diff
changeset
|
2894 SCHARS (SYMBOL_NAME (modes[i]))); |
40db0673e6f0
Most uses of XSTRING combined with STRING_BYTES or indirection changed to
Ken Raeburn <raeburn@raeburn.org>
parents:
46310
diff
changeset
|
2895 p += SCHARS (SYMBOL_NAME (modes[i])); |
40625
1248b61b7baf
(Fdescribe_buffer_bindings): Print character property
Richard M. Stallman <rms@gnu.org>
parents:
40401
diff
changeset
|
2896 *p++ = '\''; |
1248b61b7baf
(Fdescribe_buffer_bindings): Print character property
Richard M. Stallman <rms@gnu.org>
parents:
40401
diff
changeset
|
2897 bcopy (" Minor Mode Bindings", p, sizeof (" Minor Mode Bindings") - 1); |
1248b61b7baf
(Fdescribe_buffer_bindings): Print character property
Richard M. Stallman <rms@gnu.org>
parents:
40401
diff
changeset
|
2898 p += sizeof (" Minor Mode Bindings") - 1; |
1248b61b7baf
(Fdescribe_buffer_bindings): Print character property
Richard M. Stallman <rms@gnu.org>
parents:
40401
diff
changeset
|
2899 *p = 0; |
1248b61b7baf
(Fdescribe_buffer_bindings): Print character property
Richard M. Stallman <rms@gnu.org>
parents:
40401
diff
changeset
|
2900 |
60066
eca75f16d020
(describe_map_tree): New arg MENTION_SHADOW. Calls changed.
Richard M. Stallman <rms@gnu.org>
parents:
59754
diff
changeset
|
2901 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
|
2902 title, nomenu, 0, 0, 0); |
40625
1248b61b7baf
(Fdescribe_buffer_bindings): Print character property
Richard M. Stallman <rms@gnu.org>
parents:
40401
diff
changeset
|
2903 shadow = Fcons (maps[i], shadow); |
1248b61b7baf
(Fdescribe_buffer_bindings): Print character property
Richard M. Stallman <rms@gnu.org>
parents:
40401
diff
changeset
|
2904 } |
1248b61b7baf
(Fdescribe_buffer_bindings): Print character property
Richard M. Stallman <rms@gnu.org>
parents:
40401
diff
changeset
|
2905 |
1248b61b7baf
(Fdescribe_buffer_bindings): Print character property
Richard M. Stallman <rms@gnu.org>
parents:
40401
diff
changeset
|
2906 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
|
2907 XBUFFER (buffer), Qlocal_map); |
1248b61b7baf
(Fdescribe_buffer_bindings): Print character property
Richard M. Stallman <rms@gnu.org>
parents:
40401
diff
changeset
|
2908 if (!NILP (start1)) |
1248b61b7baf
(Fdescribe_buffer_bindings): Print character property
Richard M. Stallman <rms@gnu.org>
parents:
40401
diff
changeset
|
2909 { |
1248b61b7baf
(Fdescribe_buffer_bindings): Print character property
Richard M. Stallman <rms@gnu.org>
parents:
40401
diff
changeset
|
2910 if (EQ (start1, XBUFFER (buffer)->keymap)) |
1248b61b7baf
(Fdescribe_buffer_bindings): Print character property
Richard M. Stallman <rms@gnu.org>
parents:
40401
diff
changeset
|
2911 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
|
2912 "\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
|
2913 else |
1248b61b7baf
(Fdescribe_buffer_bindings): Print character property
Richard M. Stallman <rms@gnu.org>
parents:
40401
diff
changeset
|
2914 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
|
2915 "\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
|
2916 nomenu, 0, 0, 0); |
40625
1248b61b7baf
(Fdescribe_buffer_bindings): Print character property
Richard M. Stallman <rms@gnu.org>
parents:
40401
diff
changeset
|
2917 |
1248b61b7baf
(Fdescribe_buffer_bindings): Print character property
Richard M. Stallman <rms@gnu.org>
parents:
40401
diff
changeset
|
2918 shadow = Fcons (start1, shadow); |
1248b61b7baf
(Fdescribe_buffer_bindings): Print character property
Richard M. Stallman <rms@gnu.org>
parents:
40401
diff
changeset
|
2919 } |
1248b61b7baf
(Fdescribe_buffer_bindings): Print character property
Richard M. Stallman <rms@gnu.org>
parents:
40401
diff
changeset
|
2920 } |
250 | 2921 |
16465
398e3995162d
(describe_buffer_bindings): Pass 1 for PARTIAL
Richard M. Stallman <rms@gnu.org>
parents:
16227
diff
changeset
|
2922 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
|
2923 "\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
|
2924 |
26c09987d2f3
(describe_buffer_bindings): Print bindings from
Richard M. Stallman <rms@gnu.org>
parents:
12542
diff
changeset
|
2925 /* Print the function-key-map translations under this prefix. */ |
26c09987d2f3
(describe_buffer_bindings): Print bindings from
Richard M. Stallman <rms@gnu.org>
parents:
12542
diff
changeset
|
2926 if (!NILP (Vfunction_key_map)) |
26c09987d2f3
(describe_buffer_bindings): Print bindings from
Richard M. Stallman <rms@gnu.org>
parents:
12542
diff
changeset
|
2927 describe_map_tree (Vfunction_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
|
2928 "\f\nFunction key map translations", nomenu, 1, 0, 0); |
250 | 2929 |
7186
092688f7ebbb
(describe_buffer_bindings): gcpro stuff. Delete some unused code.
Karl Heuer <kwzh@gnu.org>
parents:
7184
diff
changeset
|
2930 UNGCPRO; |
250 | 2931 return Qnil; |
2932 } | |
2933 | |
13947 | 2934 /* Insert a description of the key bindings in STARTMAP, |
250 | 2935 followed by those of all maps reachable through STARTMAP. |
2936 If PARTIAL is nonzero, omit certain "uninteresting" commands | |
2937 (such as `undefined'). | |
3952
f9dfc2872fb0
(describe_map_tree): Insert key_heading here.
Richard M. Stallman <rms@gnu.org>
parents:
3908
diff
changeset
|
2938 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
|
2939 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
|
2940 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
|
2941 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
|
2942 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
|
2943 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
|
2944 |
26c09987d2f3
(describe_buffer_bindings): Print bindings from
Richard M. Stallman <rms@gnu.org>
parents:
12542
diff
changeset
|
2945 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
|
2946 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
|
2947 |
2e0c4159e94b
(describe_map_tree): New arg always_title. Callers changed.
Richard M. Stallman <rms@gnu.org>
parents:
13201
diff
changeset
|
2948 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
|
2949 to look through. |
eca75f16d020
(describe_map_tree): New arg MENTION_SHADOW. Calls changed.
Richard M. Stallman <rms@gnu.org>
parents:
59754
diff
changeset
|
2950 |
eca75f16d020
(describe_map_tree): New arg MENTION_SHADOW. Calls changed.
Richard M. Stallman <rms@gnu.org>
parents:
59754
diff
changeset
|
2951 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
|
2952 don't omit it; instead, mention it but say it is shadowed. */ |
250 | 2953 |
2954 void | |
13245
2e0c4159e94b
(describe_map_tree): New arg always_title. Callers changed.
Richard M. Stallman <rms@gnu.org>
parents:
13201
diff
changeset
|
2955 describe_map_tree (startmap, partial, shadow, prefix, title, nomenu, transl, |
60066
eca75f16d020
(describe_map_tree): New arg MENTION_SHADOW. Calls changed.
Richard M. Stallman <rms@gnu.org>
parents:
59754
diff
changeset
|
2956 always_title, mention_shadow) |
3952
f9dfc2872fb0
(describe_map_tree): Insert key_heading here.
Richard M. Stallman <rms@gnu.org>
parents:
3908
diff
changeset
|
2957 Lisp_Object startmap, shadow, prefix; |
250 | 2958 int partial; |
3952
f9dfc2872fb0
(describe_map_tree): Insert key_heading here.
Richard M. Stallman <rms@gnu.org>
parents:
3908
diff
changeset
|
2959 char *title; |
5551
2b8f405f5103
(describe_map_tree): New arg NOMENU.
Richard M. Stallman <rms@gnu.org>
parents:
5367
diff
changeset
|
2960 int nomenu; |
12710
26c09987d2f3
(describe_buffer_bindings): Print bindings from
Richard M. Stallman <rms@gnu.org>
parents:
12542
diff
changeset
|
2961 int transl; |
13245
2e0c4159e94b
(describe_map_tree): New arg always_title. Callers changed.
Richard M. Stallman <rms@gnu.org>
parents:
13201
diff
changeset
|
2962 int always_title; |
60066
eca75f16d020
(describe_map_tree): New arg MENTION_SHADOW. Calls changed.
Richard M. Stallman <rms@gnu.org>
parents:
59754
diff
changeset
|
2963 int mention_shadow; |
250 | 2964 { |
20883
4aeabf3b8f98
(describe_map_tree): Add the maps we have already
Richard M. Stallman <rms@gnu.org>
parents:
20850
diff
changeset
|
2965 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
|
2966 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
|
2967 int something = 0; |
3952
f9dfc2872fb0
(describe_map_tree): Insert key_heading here.
Richard M. Stallman <rms@gnu.org>
parents:
3908
diff
changeset
|
2968 char *key_heading |
f9dfc2872fb0
(describe_map_tree): Insert key_heading here.
Richard M. Stallman <rms@gnu.org>
parents:
3908
diff
changeset
|
2969 = "\ |
f9dfc2872fb0
(describe_map_tree): Insert key_heading here.
Richard M. Stallman <rms@gnu.org>
parents:
3908
diff
changeset
|
2970 key binding\n\ |
f9dfc2872fb0
(describe_map_tree): Insert key_heading here.
Richard M. Stallman <rms@gnu.org>
parents:
3908
diff
changeset
|
2971 --- -------\n"; |
250 | 2972 |
20883
4aeabf3b8f98
(describe_map_tree): Add the maps we have already
Richard M. Stallman <rms@gnu.org>
parents:
20850
diff
changeset
|
2973 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
|
2974 seen = Qnil; |
7184
caac285c072d
(describe_map_tree): gcpro some things.
Karl Heuer <kwzh@gnu.org>
parents:
7183
diff
changeset
|
2975 sub_shadows = Qnil; |
caac285c072d
(describe_map_tree): gcpro some things.
Karl Heuer <kwzh@gnu.org>
parents:
7183
diff
changeset
|
2976 GCPRO3 (maps, seen, sub_shadows); |
250 | 2977 |
5551
2b8f405f5103
(describe_map_tree): New arg NOMENU.
Richard M. Stallman <rms@gnu.org>
parents:
5367
diff
changeset
|
2978 if (nomenu) |
2b8f405f5103
(describe_map_tree): New arg NOMENU.
Richard M. Stallman <rms@gnu.org>
parents:
5367
diff
changeset
|
2979 { |
2b8f405f5103
(describe_map_tree): New arg NOMENU.
Richard M. Stallman <rms@gnu.org>
parents:
5367
diff
changeset
|
2980 Lisp_Object list; |
2b8f405f5103
(describe_map_tree): New arg NOMENU.
Richard M. Stallman <rms@gnu.org>
parents:
5367
diff
changeset
|
2981 |
2b8f405f5103
(describe_map_tree): New arg NOMENU.
Richard M. Stallman <rms@gnu.org>
parents:
5367
diff
changeset
|
2982 /* Delete from MAPS each element that is for the menu bar. */ |
25662
0a7261c1d487
Use XCAR, XCDR, and XFLOAT_DATA instead of explicit member access.
Ken Raeburn <raeburn@raeburn.org>
parents:
25600
diff
changeset
|
2983 for (list = maps; !NILP (list); list = XCDR (list)) |
5551
2b8f405f5103
(describe_map_tree): New arg NOMENU.
Richard M. Stallman <rms@gnu.org>
parents:
5367
diff
changeset
|
2984 { |
2b8f405f5103
(describe_map_tree): New arg NOMENU.
Richard M. Stallman <rms@gnu.org>
parents:
5367
diff
changeset
|
2985 Lisp_Object elt, prefix, tem; |
2b8f405f5103
(describe_map_tree): New arg NOMENU.
Richard M. Stallman <rms@gnu.org>
parents:
5367
diff
changeset
|
2986 |
2b8f405f5103
(describe_map_tree): New arg NOMENU.
Richard M. Stallman <rms@gnu.org>
parents:
5367
diff
changeset
|
2987 elt = Fcar (list); |
2b8f405f5103
(describe_map_tree): New arg NOMENU.
Richard M. Stallman <rms@gnu.org>
parents:
5367
diff
changeset
|
2988 prefix = Fcar (elt); |
2b8f405f5103
(describe_map_tree): New arg NOMENU.
Richard M. Stallman <rms@gnu.org>
parents:
5367
diff
changeset
|
2989 if (XVECTOR (prefix)->size >= 1) |
2b8f405f5103
(describe_map_tree): New arg NOMENU.
Richard M. Stallman <rms@gnu.org>
parents:
5367
diff
changeset
|
2990 { |
2b8f405f5103
(describe_map_tree): New arg NOMENU.
Richard M. Stallman <rms@gnu.org>
parents:
5367
diff
changeset
|
2991 tem = Faref (prefix, make_number (0)); |
2b8f405f5103
(describe_map_tree): New arg NOMENU.
Richard M. Stallman <rms@gnu.org>
parents:
5367
diff
changeset
|
2992 if (EQ (tem, Qmenu_bar)) |
2b8f405f5103
(describe_map_tree): New arg NOMENU.
Richard M. Stallman <rms@gnu.org>
parents:
5367
diff
changeset
|
2993 maps = Fdelq (elt, maps); |
2b8f405f5103
(describe_map_tree): New arg NOMENU.
Richard M. Stallman <rms@gnu.org>
parents:
5367
diff
changeset
|
2994 } |
2b8f405f5103
(describe_map_tree): New arg NOMENU.
Richard M. Stallman <rms@gnu.org>
parents:
5367
diff
changeset
|
2995 } |
2b8f405f5103
(describe_map_tree): New arg NOMENU.
Richard M. Stallman <rms@gnu.org>
parents:
5367
diff
changeset
|
2996 } |
2b8f405f5103
(describe_map_tree): New arg NOMENU.
Richard M. Stallman <rms@gnu.org>
parents:
5367
diff
changeset
|
2997 |
13245
2e0c4159e94b
(describe_map_tree): New arg always_title. Callers changed.
Richard M. Stallman <rms@gnu.org>
parents:
13201
diff
changeset
|
2998 if (!NILP (maps) || always_title) |
3952
f9dfc2872fb0
(describe_map_tree): Insert key_heading here.
Richard M. Stallman <rms@gnu.org>
parents:
3908
diff
changeset
|
2999 { |
f9dfc2872fb0
(describe_map_tree): Insert key_heading here.
Richard M. Stallman <rms@gnu.org>
parents:
3908
diff
changeset
|
3000 if (title) |
4023
5e4f918d5d44
(describe_map_tree): When inserting TITLE, mention PREFIX.
Richard M. Stallman <rms@gnu.org>
parents:
3962
diff
changeset
|
3001 { |
5e4f918d5d44
(describe_map_tree): When inserting TITLE, mention PREFIX.
Richard M. Stallman <rms@gnu.org>
parents:
3962
diff
changeset
|
3002 insert_string (title); |
5e4f918d5d44
(describe_map_tree): When inserting TITLE, mention PREFIX.
Richard M. Stallman <rms@gnu.org>
parents:
3962
diff
changeset
|
3003 if (!NILP (prefix)) |
5e4f918d5d44
(describe_map_tree): When inserting TITLE, mention PREFIX.
Richard M. Stallman <rms@gnu.org>
parents:
3962
diff
changeset
|
3004 { |
5e4f918d5d44
(describe_map_tree): When inserting TITLE, mention PREFIX.
Richard M. Stallman <rms@gnu.org>
parents:
3962
diff
changeset
|
3005 insert_string (" Starting With "); |
54925
f0a7441d22f6
(Fkey_description): Add optional PREFIX arg.
Kim F. Storm <storm@cua.dk>
parents:
53808
diff
changeset
|
3006 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
|
3007 } |
5e4f918d5d44
(describe_map_tree): When inserting TITLE, mention PREFIX.
Richard M. Stallman <rms@gnu.org>
parents:
3962
diff
changeset
|
3008 insert_string (":\n"); |
5e4f918d5d44
(describe_map_tree): When inserting TITLE, mention PREFIX.
Richard M. Stallman <rms@gnu.org>
parents:
3962
diff
changeset
|
3009 } |
3952
f9dfc2872fb0
(describe_map_tree): Insert key_heading here.
Richard M. Stallman <rms@gnu.org>
parents:
3908
diff
changeset
|
3010 insert_string (key_heading); |
4023
5e4f918d5d44
(describe_map_tree): When inserting TITLE, mention PREFIX.
Richard M. Stallman <rms@gnu.org>
parents:
3962
diff
changeset
|
3011 something = 1; |
3952
f9dfc2872fb0
(describe_map_tree): Insert key_heading here.
Richard M. Stallman <rms@gnu.org>
parents:
3908
diff
changeset
|
3012 } |
f9dfc2872fb0
(describe_map_tree): Insert key_heading here.
Richard M. Stallman <rms@gnu.org>
parents:
3908
diff
changeset
|
3013 |
485 | 3014 for (; !NILP (maps); maps = Fcdr (maps)) |
250 | 3015 { |
7184
caac285c072d
(describe_map_tree): gcpro some things.
Karl Heuer <kwzh@gnu.org>
parents:
7183
diff
changeset
|
3016 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
|
3017 |
250 | 3018 elt = Fcar (maps); |
3952
f9dfc2872fb0
(describe_map_tree): Insert key_heading here.
Richard M. Stallman <rms@gnu.org>
parents:
3908
diff
changeset
|
3019 prefix = Fcar (elt); |
250 | 3020 |
3952
f9dfc2872fb0
(describe_map_tree): Insert key_heading here.
Richard M. Stallman <rms@gnu.org>
parents:
3908
diff
changeset
|
3021 sub_shadows = Qnil; |
f9dfc2872fb0
(describe_map_tree): Insert key_heading here.
Richard M. Stallman <rms@gnu.org>
parents:
3908
diff
changeset
|
3022 |
25662
0a7261c1d487
Use XCAR, XCDR, and XFLOAT_DATA instead of explicit member access.
Ken Raeburn <raeburn@raeburn.org>
parents:
25600
diff
changeset
|
3023 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
|
3024 { |
f9dfc2872fb0
(describe_map_tree): Insert key_heading here.
Richard M. Stallman <rms@gnu.org>
parents:
3908
diff
changeset
|
3025 Lisp_Object shmap; |
f9dfc2872fb0
(describe_map_tree): Insert key_heading here.
Richard M. Stallman <rms@gnu.org>
parents:
3908
diff
changeset
|
3026 |
25662
0a7261c1d487
Use XCAR, XCDR, and XFLOAT_DATA instead of explicit member access.
Ken Raeburn <raeburn@raeburn.org>
parents:
25600
diff
changeset
|
3027 shmap = XCAR (tail); |
250 | 3028 |
3952
f9dfc2872fb0
(describe_map_tree): Insert key_heading here.
Richard M. Stallman <rms@gnu.org>
parents:
3908
diff
changeset
|
3029 /* 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
|
3030 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
|
3031 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
|
3032 || (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
|
3033 ; |
f9dfc2872fb0
(describe_map_tree): Insert key_heading here.
Richard M. Stallman <rms@gnu.org>
parents:
3908
diff
changeset
|
3034 /* 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
|
3035 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
|
3036 what we should use. */ |
f9dfc2872fb0
(describe_map_tree): Insert key_heading here.
Richard M. Stallman <rms@gnu.org>
parents:
3908
diff
changeset
|
3037 else |
f9dfc2872fb0
(describe_map_tree): Insert key_heading here.
Richard M. Stallman <rms@gnu.org>
parents:
3908
diff
changeset
|
3038 { |
6859
f34b91fa388c
(describe_map_tree): Fix call to Flookup_key.
Richard M. Stallman <rms@gnu.org>
parents:
6834
diff
changeset
|
3039 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
|
3040 if (INTEGERP (shmap)) |
3952
f9dfc2872fb0
(describe_map_tree): Insert key_heading here.
Richard M. Stallman <rms@gnu.org>
parents:
3908
diff
changeset
|
3041 shmap = Qnil; |
f9dfc2872fb0
(describe_map_tree): Insert key_heading here.
Richard M. Stallman <rms@gnu.org>
parents:
3908
diff
changeset
|
3042 } |
250 | 3043 |
3952
f9dfc2872fb0
(describe_map_tree): Insert key_heading here.
Richard M. Stallman <rms@gnu.org>
parents:
3908
diff
changeset
|
3044 /* 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
|
3045 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
|
3046 describe this map at all. */ |
32988
c3435dc00ed7
* lisp.h (KEYMAPP): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
32889
diff
changeset
|
3047 if (!NILP (shmap) && !KEYMAPP (shmap)) |
3952
f9dfc2872fb0
(describe_map_tree): Insert key_heading here.
Richard M. Stallman <rms@gnu.org>
parents:
3908
diff
changeset
|
3048 goto skip; |
f9dfc2872fb0
(describe_map_tree): Insert key_heading here.
Richard M. Stallman <rms@gnu.org>
parents:
3908
diff
changeset
|
3049 |
f9dfc2872fb0
(describe_map_tree): Insert key_heading here.
Richard M. Stallman <rms@gnu.org>
parents:
3908
diff
changeset
|
3050 if (!NILP (shmap)) |
f9dfc2872fb0
(describe_map_tree): Insert key_heading here.
Richard M. Stallman <rms@gnu.org>
parents:
3908
diff
changeset
|
3051 sub_shadows = Fcons (shmap, sub_shadows); |
250 | 3052 } |
3053 | |
20883
4aeabf3b8f98
(describe_map_tree): Add the maps we have already
Richard M. Stallman <rms@gnu.org>
parents:
20850
diff
changeset
|
3054 /* 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
|
3055 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
|
3056 { |
4aeabf3b8f98
(describe_map_tree): Add the maps we have already
Richard M. Stallman <rms@gnu.org>
parents:
20850
diff
changeset
|
3057 Lisp_Object tem; |
4aeabf3b8f98
(describe_map_tree): Add the maps we have already
Richard M. Stallman <rms@gnu.org>
parents:
20850
diff
changeset
|
3058 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
|
3059 if (!NILP (tem)) |
20883
4aeabf3b8f98
(describe_map_tree): Add the maps we have already
Richard M. Stallman <rms@gnu.org>
parents:
20850
diff
changeset
|
3060 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
|
3061 } |
4aeabf3b8f98
(describe_map_tree): Add the maps we have already
Richard M. Stallman <rms@gnu.org>
parents:
20850
diff
changeset
|
3062 |
4aeabf3b8f98
(describe_map_tree): Add the maps we have already
Richard M. Stallman <rms@gnu.org>
parents:
20850
diff
changeset
|
3063 describe_map (Fcdr (elt), prefix, |
12710
26c09987d2f3
(describe_buffer_bindings): Print bindings from
Richard M. Stallman <rms@gnu.org>
parents:
12542
diff
changeset
|
3064 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
|
3065 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
|
3066 |
f9dfc2872fb0
(describe_map_tree): Insert key_heading here.
Richard M. Stallman <rms@gnu.org>
parents:
3908
diff
changeset
|
3067 skip: ; |
250 | 3068 } |
3069 | |
4023
5e4f918d5d44
(describe_map_tree): When inserting TITLE, mention PREFIX.
Richard M. Stallman <rms@gnu.org>
parents:
3962
diff
changeset
|
3070 if (something) |
5e4f918d5d44
(describe_map_tree): When inserting TITLE, mention PREFIX.
Richard M. Stallman <rms@gnu.org>
parents:
3962
diff
changeset
|
3071 insert_string ("\n"); |
5e4f918d5d44
(describe_map_tree): When inserting TITLE, mention PREFIX.
Richard M. Stallman <rms@gnu.org>
parents:
3962
diff
changeset
|
3072 |
250 | 3073 UNGCPRO; |
3074 } | |
3075 | |
14304
57194b6a555d
(Faccessible_keymaps): Doc fix.
Karl Heuer <kwzh@gnu.org>
parents:
14186
diff
changeset
|
3076 static int previous_description_column; |
57194b6a555d
(Faccessible_keymaps): Doc fix.
Karl Heuer <kwzh@gnu.org>
parents:
14186
diff
changeset
|
3077 |
250 | 3078 static void |
41293
3db86c7bf56f
(Fdescribe_vector): Add `describer' parameter.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
41001
diff
changeset
|
3079 describe_command (definition, args) |
3db86c7bf56f
(Fdescribe_vector): Add `describer' parameter.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
41001
diff
changeset
|
3080 Lisp_Object definition, args; |
250 | 3081 { |
3082 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
|
3083 int column = (int) current_column (); /* iftc */ |
14304
57194b6a555d
(Faccessible_keymaps): Doc fix.
Karl Heuer <kwzh@gnu.org>
parents:
14186
diff
changeset
|
3084 int description_column; |
57194b6a555d
(Faccessible_keymaps): Doc fix.
Karl Heuer <kwzh@gnu.org>
parents:
14186
diff
changeset
|
3085 |
57194b6a555d
(Faccessible_keymaps): Doc fix.
Karl Heuer <kwzh@gnu.org>
parents:
14186
diff
changeset
|
3086 /* If column 16 is no good, go to col 32; |
57194b6a555d
(Faccessible_keymaps): Doc fix.
Karl Heuer <kwzh@gnu.org>
parents:
14186
diff
changeset
|
3087 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
|
3088 if (column > 30) |
57194b6a555d
(Faccessible_keymaps): Doc fix.
Karl Heuer <kwzh@gnu.org>
parents:
14186
diff
changeset
|
3089 { |
57194b6a555d
(Faccessible_keymaps): Doc fix.
Karl Heuer <kwzh@gnu.org>
parents:
14186
diff
changeset
|
3090 insert_char ('\n'); |
57194b6a555d
(Faccessible_keymaps): Doc fix.
Karl Heuer <kwzh@gnu.org>
parents:
14186
diff
changeset
|
3091 description_column = 32; |
57194b6a555d
(Faccessible_keymaps): Doc fix.
Karl Heuer <kwzh@gnu.org>
parents:
14186
diff
changeset
|
3092 } |
57194b6a555d
(Faccessible_keymaps): Doc fix.
Karl Heuer <kwzh@gnu.org>
parents:
14186
diff
changeset
|
3093 else if (column > 14 || (column > 10 && previous_description_column == 32)) |
57194b6a555d
(Faccessible_keymaps): Doc fix.
Karl Heuer <kwzh@gnu.org>
parents:
14186
diff
changeset
|
3094 description_column = 32; |
57194b6a555d
(Faccessible_keymaps): Doc fix.
Karl Heuer <kwzh@gnu.org>
parents:
14186
diff
changeset
|
3095 else |
57194b6a555d
(Faccessible_keymaps): Doc fix.
Karl Heuer <kwzh@gnu.org>
parents:
14186
diff
changeset
|
3096 description_column = 16; |
57194b6a555d
(Faccessible_keymaps): Doc fix.
Karl Heuer <kwzh@gnu.org>
parents:
14186
diff
changeset
|
3097 |
57194b6a555d
(Faccessible_keymaps): Doc fix.
Karl Heuer <kwzh@gnu.org>
parents:
14186
diff
changeset
|
3098 Findent_to (make_number (description_column), make_number (1)); |
57194b6a555d
(Faccessible_keymaps): Doc fix.
Karl Heuer <kwzh@gnu.org>
parents:
14186
diff
changeset
|
3099 previous_description_column = description_column; |
250 | 3100 |
9123
c225137ddefb
(get_keyelt, store_in_keymap, Fcopy_keymap, Fdefine_key, Flookup_key,
Karl Heuer <kwzh@gnu.org>
parents:
8922
diff
changeset
|
3101 if (SYMBOLP (definition)) |
250 | 3102 { |
45404
3885467d7b12
* keymap.c (silly_event_symbol_error, Fsingle_key_description)
Ken Raeburn <raeburn@raeburn.org>
parents:
45279
diff
changeset
|
3103 tem1 = SYMBOL_NAME (definition); |
250 | 3104 insert1 (tem1); |
21539
b9606d56f91f
Revert erroneous 1998-04-08 change.
Dave Love <fx@gnu.org>
parents:
21514
diff
changeset
|
3105 insert_string ("\n"); |
250 | 3106 } |
12710
26c09987d2f3
(describe_buffer_bindings): Print bindings from
Richard M. Stallman <rms@gnu.org>
parents:
12542
diff
changeset
|
3107 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
|
3108 insert_string ("Keyboard Macro\n"); |
32988
c3435dc00ed7
* lisp.h (KEYMAPP): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
32889
diff
changeset
|
3109 else if (KEYMAPP (definition)) |
c3435dc00ed7
* lisp.h (KEYMAPP): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
32889
diff
changeset
|
3110 insert_string ("Prefix Command\n"); |
250 | 3111 else |
32988
c3435dc00ed7
* lisp.h (KEYMAPP): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
32889
diff
changeset
|
3112 insert_string ("??\n"); |
250 | 3113 } |
3114 | |
12710
26c09987d2f3
(describe_buffer_bindings): Print bindings from
Richard M. Stallman <rms@gnu.org>
parents:
12542
diff
changeset
|
3115 static void |
41293
3db86c7bf56f
(Fdescribe_vector): Add `describer' parameter.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
41001
diff
changeset
|
3116 describe_translation (definition, args) |
3db86c7bf56f
(Fdescribe_vector): Add `describer' parameter.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
41001
diff
changeset
|
3117 Lisp_Object definition, args; |
12710
26c09987d2f3
(describe_buffer_bindings): Print bindings from
Richard M. Stallman <rms@gnu.org>
parents:
12542
diff
changeset
|
3118 { |
26c09987d2f3
(describe_buffer_bindings): Print bindings from
Richard M. Stallman <rms@gnu.org>
parents:
12542
diff
changeset
|
3119 register Lisp_Object tem1; |
26c09987d2f3
(describe_buffer_bindings): Print bindings from
Richard M. Stallman <rms@gnu.org>
parents:
12542
diff
changeset
|
3120 |
26c09987d2f3
(describe_buffer_bindings): Print bindings from
Richard M. Stallman <rms@gnu.org>
parents:
12542
diff
changeset
|
3121 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
|
3122 |
26c09987d2f3
(describe_buffer_bindings): Print bindings from
Richard M. Stallman <rms@gnu.org>
parents:
12542
diff
changeset
|
3123 if (SYMBOLP (definition)) |
26c09987d2f3
(describe_buffer_bindings): Print bindings from
Richard M. Stallman <rms@gnu.org>
parents:
12542
diff
changeset
|
3124 { |
45404
3885467d7b12
* keymap.c (silly_event_symbol_error, Fsingle_key_description)
Ken Raeburn <raeburn@raeburn.org>
parents:
45279
diff
changeset
|
3125 tem1 = SYMBOL_NAME (definition); |
12710
26c09987d2f3
(describe_buffer_bindings): Print bindings from
Richard M. Stallman <rms@gnu.org>
parents:
12542
diff
changeset
|
3126 insert1 (tem1); |
26c09987d2f3
(describe_buffer_bindings): Print bindings from
Richard M. Stallman <rms@gnu.org>
parents:
12542
diff
changeset
|
3127 insert_string ("\n"); |
26c09987d2f3
(describe_buffer_bindings): Print bindings from
Richard M. Stallman <rms@gnu.org>
parents:
12542
diff
changeset
|
3128 } |
26c09987d2f3
(describe_buffer_bindings): Print bindings from
Richard M. Stallman <rms@gnu.org>
parents:
12542
diff
changeset
|
3129 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
|
3130 { |
54925
f0a7441d22f6
(Fkey_description): Add optional PREFIX arg.
Kim F. Storm <storm@cua.dk>
parents:
53808
diff
changeset
|
3131 insert1 (Fkey_description (definition, Qnil)); |
13343
cc0f24bdfab1
(describe_translation): Insert newline after key description.
Richard M. Stallman <rms@gnu.org>
parents:
13245
diff
changeset
|
3132 insert_string ("\n"); |
cc0f24bdfab1
(describe_translation): Insert newline after key description.
Richard M. Stallman <rms@gnu.org>
parents:
13245
diff
changeset
|
3133 } |
32988
c3435dc00ed7
* lisp.h (KEYMAPP): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
32889
diff
changeset
|
3134 else if (KEYMAPP (definition)) |
c3435dc00ed7
* lisp.h (KEYMAPP): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
32889
diff
changeset
|
3135 insert_string ("Prefix Command\n"); |
12710
26c09987d2f3
(describe_buffer_bindings): Print bindings from
Richard M. Stallman <rms@gnu.org>
parents:
12542
diff
changeset
|
3136 else |
32988
c3435dc00ed7
* lisp.h (KEYMAPP): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
32889
diff
changeset
|
3137 insert_string ("??\n"); |
12710
26c09987d2f3
(describe_buffer_bindings): Print bindings from
Richard M. Stallman <rms@gnu.org>
parents:
12542
diff
changeset
|
3138 } |
26c09987d2f3
(describe_buffer_bindings): Print bindings from
Richard M. Stallman <rms@gnu.org>
parents:
12542
diff
changeset
|
3139 |
6974
ab22b527d380
(describe_map): Merge with describe_map_2.
Karl Heuer <kwzh@gnu.org>
parents:
6859
diff
changeset
|
3140 /* 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
|
3141 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
|
3142 PARTIAL, SHADOW, NOMENU are as in `describe_map_tree' above. */ |
250 | 3143 |
3144 static void | |
60066
eca75f16d020
(describe_map_tree): New arg MENTION_SHADOW. Calls changed.
Richard M. Stallman <rms@gnu.org>
parents:
59754
diff
changeset
|
3145 describe_map (map, prefix, elt_describer, partial, shadow, |
eca75f16d020
(describe_map_tree): New arg MENTION_SHADOW. Calls changed.
Richard M. Stallman <rms@gnu.org>
parents:
59754
diff
changeset
|
3146 seen, nomenu, mention_shadow) |
6974
ab22b527d380
(describe_map): Merge with describe_map_2.
Karl Heuer <kwzh@gnu.org>
parents:
6859
diff
changeset
|
3147 register Lisp_Object map; |
54925
f0a7441d22f6
(Fkey_description): Add optional PREFIX arg.
Kim F. Storm <storm@cua.dk>
parents:
53808
diff
changeset
|
3148 Lisp_Object prefix; |
41293
3db86c7bf56f
(Fdescribe_vector): Add `describer' parameter.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
41001
diff
changeset
|
3149 void (*elt_describer) P_ ((Lisp_Object, Lisp_Object)); |
250 | 3150 int partial; |
3151 Lisp_Object shadow; | |
6976
4d540eeb2dd5
(describe_map_tree, describe_map): Skip keymaps we've seen before.
Karl Heuer <kwzh@gnu.org>
parents:
6974
diff
changeset
|
3152 Lisp_Object *seen; |
14129
d0b95da4f1f2
(describe_map): New arg nomenu.
Karl Heuer <kwzh@gnu.org>
parents:
14099
diff
changeset
|
3153 int nomenu; |
60066
eca75f16d020
(describe_map_tree): New arg MENTION_SHADOW. Calls changed.
Richard M. Stallman <rms@gnu.org>
parents:
59754
diff
changeset
|
3154 int mention_shadow; |
250 | 3155 { |
3952
f9dfc2872fb0
(describe_map_tree): Insert key_heading here.
Richard M. Stallman <rms@gnu.org>
parents:
3908
diff
changeset
|
3156 Lisp_Object tail, definition, event; |
3908
a148b4ff79c6
(describe_map_2): Cleanups.
Richard M. Stallman <rms@gnu.org>
parents:
3735
diff
changeset
|
3157 Lisp_Object tem; |
250 | 3158 Lisp_Object suppress; |
3159 Lisp_Object kludge; | |
3160 int first = 1; | |
3161 struct gcpro gcpro1, gcpro2, gcpro3; | |
3162 | |
31829
43566b0aec59
Avoid some more compiler warnings.
Gerd Moellmann <gerd@gnu.org>
parents:
31496
diff
changeset
|
3163 suppress = Qnil; |
43566b0aec59
Avoid some more compiler warnings.
Gerd Moellmann <gerd@gnu.org>
parents:
31496
diff
changeset
|
3164 |
250 | 3165 if (partial) |
3166 suppress = intern ("suppress-keymap"); | |
3167 | |
3168 /* 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
|
3169 that is done once per keymap element, we don't want to cons up a |
250 | 3170 fresh vector every time. */ |
3171 kludge = Fmake_vector (make_number (1), Qnil); | |
3908
a148b4ff79c6
(describe_map_2): Cleanups.
Richard M. Stallman <rms@gnu.org>
parents:
3735
diff
changeset
|
3172 definition = Qnil; |
250 | 3173 |
54925
f0a7441d22f6
(Fkey_description): Add optional PREFIX arg.
Kim F. Storm <storm@cua.dk>
parents:
53808
diff
changeset
|
3174 GCPRO3 (prefix, definition, kludge); |
250 | 3175 |
25662
0a7261c1d487
Use XCAR, XCDR, and XFLOAT_DATA instead of explicit member access.
Ken Raeburn <raeburn@raeburn.org>
parents:
25600
diff
changeset
|
3176 for (tail = map; CONSP (tail); tail = XCDR (tail)) |
250 | 3177 { |
3178 QUIT; | |
3179 | |
25662
0a7261c1d487
Use XCAR, XCDR, and XFLOAT_DATA instead of explicit member access.
Ken Raeburn <raeburn@raeburn.org>
parents:
25600
diff
changeset
|
3180 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
|
3181 || 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
|
3182 describe_vector (XCAR (tail), |
54925
f0a7441d22f6
(Fkey_description): Add optional PREFIX arg.
Kim F. Storm <storm@cua.dk>
parents:
53808
diff
changeset
|
3183 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
|
3184 (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
|
3185 else if (CONSP (XCAR (tail))) |
250 | 3186 { |
60066
eca75f16d020
(describe_map_tree): New arg MENTION_SHADOW. Calls changed.
Richard M. Stallman <rms@gnu.org>
parents:
59754
diff
changeset
|
3187 int this_shadowed = 0; |
25662
0a7261c1d487
Use XCAR, XCDR, and XFLOAT_DATA instead of explicit member access.
Ken Raeburn <raeburn@raeburn.org>
parents:
25600
diff
changeset
|
3188 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
|
3189 |
54925
f0a7441d22f6
(Fkey_description): Add optional PREFIX arg.
Kim F. Storm <storm@cua.dk>
parents:
53808
diff
changeset
|
3190 /* 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
|
3191 (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
|
3192 if (!(SYMBOLP (event) || INTEGERP (event))) |
7191
bd2f9c5ee54e
(Fsingle_key_description): Undo previous change.
Karl Heuer <kwzh@gnu.org>
parents:
7186
diff
changeset
|
3193 continue; |
7341
516dd16e2017
(describe_map): Ignore bindings for all except symbols and integers.
Richard M. Stallman <rms@gnu.org>
parents:
7191
diff
changeset
|
3194 |
14129
d0b95da4f1f2
(describe_map): New arg nomenu.
Karl Heuer <kwzh@gnu.org>
parents:
14099
diff
changeset
|
3195 if (nomenu && EQ (event, Qmenu_bar)) |
d0b95da4f1f2
(describe_map): New arg nomenu.
Karl Heuer <kwzh@gnu.org>
parents:
14099
diff
changeset
|
3196 continue; |
d0b95da4f1f2
(describe_map): New arg nomenu.
Karl Heuer <kwzh@gnu.org>
parents:
14099
diff
changeset
|
3197 |
25662
0a7261c1d487
Use XCAR, XCDR, and XFLOAT_DATA instead of explicit member access.
Ken Raeburn <raeburn@raeburn.org>
parents:
25600
diff
changeset
|
3198 definition = get_keyelt (XCDR (XCAR (tail)), 0); |
250 | 3199 |
1209
1aa2cd425737
* keymap.c (DENSE_TABLE_SIZE): Doc fix.
Jim Blandy <jimb@redhat.com>
parents:
1160
diff
changeset
|
3200 /* Don't show undefined commands or suppressed commands. */ |
3908
a148b4ff79c6
(describe_map_2): Cleanups.
Richard M. Stallman <rms@gnu.org>
parents:
3735
diff
changeset
|
3201 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
|
3202 if (SYMBOLP (definition) && partial) |
1209
1aa2cd425737
* keymap.c (DENSE_TABLE_SIZE): Doc fix.
Jim Blandy <jimb@redhat.com>
parents:
1160
diff
changeset
|
3203 { |
3908
a148b4ff79c6
(describe_map_2): Cleanups.
Richard M. Stallman <rms@gnu.org>
parents:
3735
diff
changeset
|
3204 tem = Fget (definition, suppress); |
a148b4ff79c6
(describe_map_2): Cleanups.
Richard M. Stallman <rms@gnu.org>
parents:
3735
diff
changeset
|
3205 if (!NILP (tem)) |
1209
1aa2cd425737
* keymap.c (DENSE_TABLE_SIZE): Doc fix.
Jim Blandy <jimb@redhat.com>
parents:
1160
diff
changeset
|
3206 continue; |
1aa2cd425737
* keymap.c (DENSE_TABLE_SIZE): Doc fix.
Jim Blandy <jimb@redhat.com>
parents:
1160
diff
changeset
|
3207 } |
250 | 3208 |
1209
1aa2cd425737
* keymap.c (DENSE_TABLE_SIZE): Doc fix.
Jim Blandy <jimb@redhat.com>
parents:
1160
diff
changeset
|
3209 /* 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
|
3210 because a local definition of the same key shadows it. */ |
250 | 3211 |
32846
c1b3ab2a1ccc
Use AREF, ASET and ASIZE macros.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
32844
diff
changeset
|
3212 ASET (kludge, 0, event); |
1209
1aa2cd425737
* keymap.c (DENSE_TABLE_SIZE): Doc fix.
Jim Blandy <jimb@redhat.com>
parents:
1160
diff
changeset
|
3213 if (!NILP (shadow)) |
1aa2cd425737
* keymap.c (DENSE_TABLE_SIZE): Doc fix.
Jim Blandy <jimb@redhat.com>
parents:
1160
diff
changeset
|
3214 { |
3952
f9dfc2872fb0
(describe_map_tree): Insert key_heading here.
Richard M. Stallman <rms@gnu.org>
parents:
3908
diff
changeset
|
3215 tem = shadow_lookup (shadow, kludge, Qt); |
60066
eca75f16d020
(describe_map_tree): New arg MENTION_SHADOW. Calls changed.
Richard M. Stallman <rms@gnu.org>
parents:
59754
diff
changeset
|
3216 if (!NILP (tem)) |
eca75f16d020
(describe_map_tree): New arg MENTION_SHADOW. Calls changed.
Richard M. Stallman <rms@gnu.org>
parents:
59754
diff
changeset
|
3217 { |
eca75f16d020
(describe_map_tree): New arg MENTION_SHADOW. Calls changed.
Richard M. Stallman <rms@gnu.org>
parents:
59754
diff
changeset
|
3218 if (mention_shadow) |
eca75f16d020
(describe_map_tree): New arg MENTION_SHADOW. Calls changed.
Richard M. Stallman <rms@gnu.org>
parents:
59754
diff
changeset
|
3219 this_shadowed = 1; |
eca75f16d020
(describe_map_tree): New arg MENTION_SHADOW. Calls changed.
Richard M. Stallman <rms@gnu.org>
parents:
59754
diff
changeset
|
3220 else |
eca75f16d020
(describe_map_tree): New arg MENTION_SHADOW. Calls changed.
Richard M. Stallman <rms@gnu.org>
parents:
59754
diff
changeset
|
3221 continue; |
eca75f16d020
(describe_map_tree): New arg MENTION_SHADOW. Calls changed.
Richard M. Stallman <rms@gnu.org>
parents:
59754
diff
changeset
|
3222 } |
1209
1aa2cd425737
* keymap.c (DENSE_TABLE_SIZE): Doc fix.
Jim Blandy <jimb@redhat.com>
parents:
1160
diff
changeset
|
3223 } |
250 | 3224 |
6974
ab22b527d380
(describe_map): Merge with describe_map_2.
Karl Heuer <kwzh@gnu.org>
parents:
6859
diff
changeset
|
3225 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
|
3226 if (!EQ (tem, definition)) continue; |
3908
a148b4ff79c6
(describe_map_2): Cleanups.
Richard M. Stallman <rms@gnu.org>
parents:
3735
diff
changeset
|
3227 |
1209
1aa2cd425737
* keymap.c (DENSE_TABLE_SIZE): Doc fix.
Jim Blandy <jimb@redhat.com>
parents:
1160
diff
changeset
|
3228 if (first) |
1aa2cd425737
* keymap.c (DENSE_TABLE_SIZE): Doc fix.
Jim Blandy <jimb@redhat.com>
parents:
1160
diff
changeset
|
3229 { |
14304
57194b6a555d
(Faccessible_keymaps): Doc fix.
Karl Heuer <kwzh@gnu.org>
parents:
14186
diff
changeset
|
3230 previous_description_column = 0; |
1209
1aa2cd425737
* keymap.c (DENSE_TABLE_SIZE): Doc fix.
Jim Blandy <jimb@redhat.com>
parents:
1160
diff
changeset
|
3231 insert ("\n", 1); |
1aa2cd425737
* keymap.c (DENSE_TABLE_SIZE): Doc fix.
Jim Blandy <jimb@redhat.com>
parents:
1160
diff
changeset
|
3232 first = 0; |
1aa2cd425737
* keymap.c (DENSE_TABLE_SIZE): Doc fix.
Jim Blandy <jimb@redhat.com>
parents:
1160
diff
changeset
|
3233 } |
1aa2cd425737
* keymap.c (DENSE_TABLE_SIZE): Doc fix.
Jim Blandy <jimb@redhat.com>
parents:
1160
diff
changeset
|
3234 |
3908
a148b4ff79c6
(describe_map_2): Cleanups.
Richard M. Stallman <rms@gnu.org>
parents:
3735
diff
changeset
|
3235 /* THIS gets the string to describe the character EVENT. */ |
54925
f0a7441d22f6
(Fkey_description): Add optional PREFIX arg.
Kim F. Storm <storm@cua.dk>
parents:
53808
diff
changeset
|
3236 insert1 (Fkey_description (kludge, prefix)); |
250 | 3237 |
1209
1aa2cd425737
* keymap.c (DENSE_TABLE_SIZE): Doc fix.
Jim Blandy <jimb@redhat.com>
parents:
1160
diff
changeset
|
3238 /* Print a description of the definition of this character. |
1aa2cd425737
* keymap.c (DENSE_TABLE_SIZE): Doc fix.
Jim Blandy <jimb@redhat.com>
parents:
1160
diff
changeset
|
3239 elt_describer will take care of spacing out far enough |
1aa2cd425737
* keymap.c (DENSE_TABLE_SIZE): Doc fix.
Jim Blandy <jimb@redhat.com>
parents:
1160
diff
changeset
|
3240 for alignment purposes. */ |
41293
3db86c7bf56f
(Fdescribe_vector): Add `describer' parameter.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
41001
diff
changeset
|
3241 (*elt_describer) (definition, Qnil); |
60066
eca75f16d020
(describe_map_tree): New arg MENTION_SHADOW. Calls changed.
Richard M. Stallman <rms@gnu.org>
parents:
59754
diff
changeset
|
3242 |
eca75f16d020
(describe_map_tree): New arg MENTION_SHADOW. Calls changed.
Richard M. Stallman <rms@gnu.org>
parents:
59754
diff
changeset
|
3243 if (this_shadowed) |
eca75f16d020
(describe_map_tree): New arg MENTION_SHADOW. Calls changed.
Richard M. Stallman <rms@gnu.org>
parents:
59754
diff
changeset
|
3244 { |
eca75f16d020
(describe_map_tree): New arg MENTION_SHADOW. Calls changed.
Richard M. Stallman <rms@gnu.org>
parents:
59754
diff
changeset
|
3245 SET_PT (PT - 1); |
eca75f16d020
(describe_map_tree): New arg MENTION_SHADOW. Calls changed.
Richard M. Stallman <rms@gnu.org>
parents:
59754
diff
changeset
|
3246 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
|
3247 SET_PT (PT + 1); |
eca75f16d020
(describe_map_tree): New arg MENTION_SHADOW. Calls changed.
Richard M. Stallman <rms@gnu.org>
parents:
59754
diff
changeset
|
3248 } |
1209
1aa2cd425737
* keymap.c (DENSE_TABLE_SIZE): Doc fix.
Jim Blandy <jimb@redhat.com>
parents:
1160
diff
changeset
|
3249 } |
25662
0a7261c1d487
Use XCAR, XCDR, and XFLOAT_DATA instead of explicit member access.
Ken Raeburn <raeburn@raeburn.org>
parents:
25600
diff
changeset
|
3250 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
|
3251 { |
4d540eeb2dd5
(describe_map_tree, describe_map): Skip keymaps we've seen before.
Karl Heuer <kwzh@gnu.org>
parents:
6974
diff
changeset
|
3252 /* 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
|
3253 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
|
3254 encountered. */ |
4d540eeb2dd5
(describe_map_tree, describe_map): Skip keymaps we've seen before.
Karl Heuer <kwzh@gnu.org>
parents:
6974
diff
changeset
|
3255 tem = Fassq (tail, *seen); |
54925
f0a7441d22f6
(Fkey_description): Add optional PREFIX arg.
Kim F. Storm <storm@cua.dk>
parents:
53808
diff
changeset
|
3256 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
|
3257 break; |
54925
f0a7441d22f6
(Fkey_description): Add optional PREFIX arg.
Kim F. Storm <storm@cua.dk>
parents:
53808
diff
changeset
|
3258 *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
|
3259 } |
250 | 3260 } |
3261 | |
3262 UNGCPRO; | |
3263 } | |
3264 | |
20319
81424cf4d446
(copy_keymap_1): Fix return type.
Andreas Schwab <schwab@suse.de>
parents:
20076
diff
changeset
|
3265 static void |
41293
3db86c7bf56f
(Fdescribe_vector): Add `describer' parameter.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
41001
diff
changeset
|
3266 describe_vector_princ (elt, fun) |
3db86c7bf56f
(Fdescribe_vector): Add `describer' parameter.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
41001
diff
changeset
|
3267 Lisp_Object elt, fun; |
250 | 3268 { |
3691
49ce2242f5c1
(get_keymap_1): Add missing semicolon.
Richard M. Stallman <rms@gnu.org>
parents:
3674
diff
changeset
|
3269 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
|
3270 call1 (fun, elt); |
3632
72cfde0cd8cd
(Fdescribe_vector): Use current buf, not standard-output.
Richard M. Stallman <rms@gnu.org>
parents:
3542
diff
changeset
|
3271 Fterpri (Qnil); |
250 | 3272 } |
3273 | |
41293
3db86c7bf56f
(Fdescribe_vector): Add `describer' parameter.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
41001
diff
changeset
|
3274 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
|
3275 doc: /* Insert a description of contents of VECTOR. |
55913
c663e2e97168
(Fdescribe_vector): Fix docstring.
Juanma Barranquero <lekktu@gmail.com>
parents:
55722
diff
changeset
|
3276 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
|
3277 DESCRIBER is the output function used; nil means use `princ'. */) |
41293
3db86c7bf56f
(Fdescribe_vector): Add `describer' parameter.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
41001
diff
changeset
|
3278 (vector, describer) |
3db86c7bf56f
(Fdescribe_vector): Add `describer' parameter.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
41001
diff
changeset
|
3279 Lisp_Object vector, describer; |
250 | 3280 { |
46293
1fb8f75062c6
Use macro SPECPDL_INDEX.
Juanma Barranquero <lekktu@gmail.com>
parents:
46142
diff
changeset
|
3281 int count = SPECPDL_INDEX (); |
41293
3db86c7bf56f
(Fdescribe_vector): Add `describer' parameter.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
41001
diff
changeset
|
3282 if (NILP (describer)) |
3db86c7bf56f
(Fdescribe_vector): Add `describer' parameter.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
41001
diff
changeset
|
3283 describer = intern ("princ"); |
3632
72cfde0cd8cd
(Fdescribe_vector): Use current buf, not standard-output.
Richard M. Stallman <rms@gnu.org>
parents:
3542
diff
changeset
|
3284 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
|
3285 CHECK_VECTOR_OR_CHAR_TABLE (vector); |
41293
3db86c7bf56f
(Fdescribe_vector): Add `describer' parameter.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
41001
diff
changeset
|
3286 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
|
3287 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
|
3288 |
72cfde0cd8cd
(Fdescribe_vector): Use current buf, not standard-output.
Richard M. Stallman <rms@gnu.org>
parents:
3542
diff
changeset
|
3289 return unbind_to (count, Qnil); |
250 | 3290 } |
3291 | |
13201
e9007fec678e
(describe_vector): Support nested char-tables.
Richard M. Stallman <rms@gnu.org>
parents:
13145
diff
changeset
|
3292 /* 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
|
3293 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
|
3294 in VECTOR. |
e9007fec678e
(describe_vector): Support nested char-tables.
Richard M. Stallman <rms@gnu.org>
parents:
13145
diff
changeset
|
3295 |
e9007fec678e
(describe_vector): Support nested char-tables.
Richard M. Stallman <rms@gnu.org>
parents:
13145
diff
changeset
|
3296 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
|
3297 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
|
3298 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
|
3299 |
e9007fec678e
(describe_vector): Support nested char-tables.
Richard M. Stallman <rms@gnu.org>
parents:
13145
diff
changeset
|
3300 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
|
3301 leads to this keymap. |
e9007fec678e
(describe_vector): Support nested char-tables.
Richard M. Stallman <rms@gnu.org>
parents:
13145
diff
changeset
|
3302 |
e9007fec678e
(describe_vector): Support nested char-tables.
Richard M. Stallman <rms@gnu.org>
parents:
13145
diff
changeset
|
3303 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
|
3304 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
|
3305 set described by this chartable. |
e9007fec678e
(describe_vector): Support nested char-tables.
Richard M. Stallman <rms@gnu.org>
parents:
13145
diff
changeset
|
3306 |
e9007fec678e
(describe_vector): Support nested char-tables.
Richard M. Stallman <rms@gnu.org>
parents:
13145
diff
changeset
|
3307 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
|
3308 (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
|
3309 |
e9007fec678e
(describe_vector): Support nested char-tables.
Richard M. Stallman <rms@gnu.org>
parents:
13145
diff
changeset
|
3310 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
|
3311 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
|
3312 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
|
3313 |
e9007fec678e
(describe_vector): Support nested char-tables.
Richard M. Stallman <rms@gnu.org>
parents:
13145
diff
changeset
|
3314 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
|
3315 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
|
3316 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
|
3317 |
208d71ea3a4f
(get_keyelt): Handle an indirect entry with meta char.
Richard M. Stallman <rms@gnu.org>
parents:
17511
diff
changeset
|
3318 When describing a sub-char-table, INDICES is a list of |
208d71ea3a4f
(get_keyelt): Handle an indirect entry with meta char.
Richard M. Stallman <rms@gnu.org>
parents:
17511
diff
changeset
|
3319 indices at higher levels in this char-table, |
41293
3db86c7bf56f
(Fdescribe_vector): Add `describer' parameter.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
41001
diff
changeset
|
3320 and CHAR_TABLE_DEPTH says how many levels down we have gone. |
3db86c7bf56f
(Fdescribe_vector): Add `describer' parameter.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
41001
diff
changeset
|
3321 |
54925
f0a7441d22f6
(Fkey_description): Add optional PREFIX arg.
Kim F. Storm <storm@cua.dk>
parents:
53808
diff
changeset
|
3322 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
|
3323 |
41293
3db86c7bf56f
(Fdescribe_vector): Add `describer' parameter.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
41001
diff
changeset
|
3324 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
|
3325 |
54925
f0a7441d22f6
(Fkey_description): Add optional PREFIX arg.
Kim F. Storm <storm@cua.dk>
parents:
53808
diff
changeset
|
3326 static void |
f0a7441d22f6
(Fkey_description): Add optional PREFIX arg.
Kim F. Storm <storm@cua.dk>
parents:
53808
diff
changeset
|
3327 describe_vector (vector, prefix, args, elt_describer, |
17788
208d71ea3a4f
(get_keyelt): Handle an indirect entry with meta char.
Richard M. Stallman <rms@gnu.org>
parents:
17511
diff
changeset
|
3328 partial, shadow, entire_map, |
60066
eca75f16d020
(describe_map_tree): New arg MENTION_SHADOW. Calls changed.
Richard M. Stallman <rms@gnu.org>
parents:
59754
diff
changeset
|
3329 indices, char_table_depth, keymap_p, |
eca75f16d020
(describe_map_tree): New arg MENTION_SHADOW. Calls changed.
Richard M. Stallman <rms@gnu.org>
parents:
59754
diff
changeset
|
3330 mention_shadow) |
250 | 3331 register Lisp_Object vector; |
54925
f0a7441d22f6
(Fkey_description): Add optional PREFIX arg.
Kim F. Storm <storm@cua.dk>
parents:
53808
diff
changeset
|
3332 Lisp_Object prefix, args; |
41293
3db86c7bf56f
(Fdescribe_vector): Add `describer' parameter.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
41001
diff
changeset
|
3333 void (*elt_describer) P_ ((Lisp_Object, Lisp_Object)); |
250 | 3334 int partial; |
3335 Lisp_Object shadow; | |
11973
4e0f3e3b4cc7
(describe_vector): New arg entire_map.
Karl Heuer <kwzh@gnu.org>
parents:
11924
diff
changeset
|
3336 Lisp_Object entire_map; |
17788
208d71ea3a4f
(get_keyelt): Handle an indirect entry with meta char.
Richard M. Stallman <rms@gnu.org>
parents:
17511
diff
changeset
|
3337 int *indices; |
208d71ea3a4f
(get_keyelt): Handle an indirect entry with meta char.
Richard M. Stallman <rms@gnu.org>
parents:
17511
diff
changeset
|
3338 int char_table_depth; |
54925
f0a7441d22f6
(Fkey_description): Add optional PREFIX arg.
Kim F. Storm <storm@cua.dk>
parents:
53808
diff
changeset
|
3339 int keymap_p; |
60066
eca75f16d020
(describe_map_tree): New arg MENTION_SHADOW. Calls changed.
Richard M. Stallman <rms@gnu.org>
parents:
59754
diff
changeset
|
3340 int mention_shadow; |
250 | 3341 { |
11973
4e0f3e3b4cc7
(describe_vector): New arg entire_map.
Karl Heuer <kwzh@gnu.org>
parents:
11924
diff
changeset
|
3342 Lisp_Object definition; |
4e0f3e3b4cc7
(describe_vector): New arg entire_map.
Karl Heuer <kwzh@gnu.org>
parents:
11924
diff
changeset
|
3343 Lisp_Object tem2; |
54925
f0a7441d22f6
(Fkey_description): Add optional PREFIX arg.
Kim F. Storm <storm@cua.dk>
parents:
53808
diff
changeset
|
3344 Lisp_Object elt_prefix = Qnil; |
250 | 3345 register int i; |
3346 Lisp_Object suppress; | |
3347 Lisp_Object kludge; | |
3348 int first = 1; | |
54925
f0a7441d22f6
(Fkey_description): Add optional PREFIX arg.
Kim F. Storm <storm@cua.dk>
parents:
53808
diff
changeset
|
3349 struct gcpro gcpro1, gcpro2, gcpro3, gcpro4; |
17036 | 3350 /* Range of elements to be handled. */ |
3351 int from, to; | |
3352 /* A flag to tell if a leaf in this level of char-table is not a | |
3353 generic character (i.e. a complete multibyte character). */ | |
3354 int complete_char; | |
17788
208d71ea3a4f
(get_keyelt): Handle an indirect entry with meta char.
Richard M. Stallman <rms@gnu.org>
parents:
17511
diff
changeset
|
3355 int character; |
208d71ea3a4f
(get_keyelt): Handle an indirect entry with meta char.
Richard M. Stallman <rms@gnu.org>
parents:
17511
diff
changeset
|
3356 int starting_i; |
208d71ea3a4f
(get_keyelt): Handle an indirect entry with meta char.
Richard M. Stallman <rms@gnu.org>
parents:
17511
diff
changeset
|
3357 |
31829
43566b0aec59
Avoid some more compiler warnings.
Gerd Moellmann <gerd@gnu.org>
parents:
31496
diff
changeset
|
3358 suppress = Qnil; |
43566b0aec59
Avoid some more compiler warnings.
Gerd Moellmann <gerd@gnu.org>
parents:
31496
diff
changeset
|
3359 |
17788
208d71ea3a4f
(get_keyelt): Handle an indirect entry with meta char.
Richard M. Stallman <rms@gnu.org>
parents:
17511
diff
changeset
|
3360 if (indices == 0) |
18613
614b916ff5bf
Fix bugs with inappropriate mixing of Lisp_Object with int.
Richard M. Stallman <rms@gnu.org>
parents:
18142
diff
changeset
|
3361 indices = (int *) alloca (3 * sizeof (int)); |
250 | 3362 |
11973
4e0f3e3b4cc7
(describe_vector): New arg entire_map.
Karl Heuer <kwzh@gnu.org>
parents:
11924
diff
changeset
|
3363 definition = Qnil; |
250 | 3364 |
54925
f0a7441d22f6
(Fkey_description): Add optional PREFIX arg.
Kim F. Storm <storm@cua.dk>
parents:
53808
diff
changeset
|
3365 if (!keymap_p) |
f0a7441d22f6
(Fkey_description): Add optional PREFIX arg.
Kim F. Storm <storm@cua.dk>
parents:
53808
diff
changeset
|
3366 { |
f0a7441d22f6
(Fkey_description): Add optional PREFIX arg.
Kim F. Storm <storm@cua.dk>
parents:
53808
diff
changeset
|
3367 /* 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
|
3368 if (!NILP (prefix) && XFASTINT (Flength (prefix)) > 0) |
f0a7441d22f6
(Fkey_description): Add optional PREFIX arg.
Kim F. Storm <storm@cua.dk>
parents:
53808
diff
changeset
|
3369 { |
f0a7441d22f6
(Fkey_description): Add optional PREFIX arg.
Kim F. Storm <storm@cua.dk>
parents:
53808
diff
changeset
|
3370 Lisp_Object tem; |
f0a7441d22f6
(Fkey_description): Add optional PREFIX arg.
Kim F. Storm <storm@cua.dk>
parents:
53808
diff
changeset
|
3371 tem = Fkey_description (prefix, Qnil); |
f0a7441d22f6
(Fkey_description): Add optional PREFIX arg.
Kim F. Storm <storm@cua.dk>
parents:
53808
diff
changeset
|
3372 elt_prefix = concat2 (tem, build_string (" ")); |
f0a7441d22f6
(Fkey_description): Add optional PREFIX arg.
Kim F. Storm <storm@cua.dk>
parents:
53808
diff
changeset
|
3373 } |
f0a7441d22f6
(Fkey_description): Add optional PREFIX arg.
Kim F. Storm <storm@cua.dk>
parents:
53808
diff
changeset
|
3374 prefix = Qnil; |
f0a7441d22f6
(Fkey_description): Add optional PREFIX arg.
Kim F. Storm <storm@cua.dk>
parents:
53808
diff
changeset
|
3375 } |
f0a7441d22f6
(Fkey_description): Add optional PREFIX arg.
Kim F. Storm <storm@cua.dk>
parents:
53808
diff
changeset
|
3376 |
250 | 3377 /* This vector gets used to present single keys to Flookup_key. Since |
3378 that is done once per vector element, we don't want to cons up a | |
3379 fresh vector every time. */ | |
3380 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
|
3381 GCPRO4 (elt_prefix, prefix, definition, kludge); |
250 | 3382 |
3383 if (partial) | |
3384 suppress = intern ("suppress-keymap"); | |
3385 | |
17036 | 3386 if (CHAR_TABLE_P (vector)) |
3387 { | |
17788
208d71ea3a4f
(get_keyelt): Handle an indirect entry with meta char.
Richard M. Stallman <rms@gnu.org>
parents:
17511
diff
changeset
|
3388 if (char_table_depth == 0) |
17036 | 3389 { |
17327
0cb065f8702e
(describe_vector): Adjusted for the new structure of Lisp_Char_Table.
Kenichi Handa <handa@m17n.org>
parents:
17264
diff
changeset
|
3390 /* VECTOR is a top level char-table. */ |
17788
208d71ea3a4f
(get_keyelt): Handle an indirect entry with meta char.
Richard M. Stallman <rms@gnu.org>
parents:
17511
diff
changeset
|
3391 complete_char = 1; |
17036 | 3392 from = 0; |
3393 to = CHAR_TABLE_ORDINARY_SLOTS; | |
3394 } | |
3395 else | |
3396 { | |
17327
0cb065f8702e
(describe_vector): Adjusted for the new structure of Lisp_Char_Table.
Kenichi Handa <handa@m17n.org>
parents:
17264
diff
changeset
|
3397 /* VECTOR is a sub char-table. */ |
17788
208d71ea3a4f
(get_keyelt): Handle an indirect entry with meta char.
Richard M. Stallman <rms@gnu.org>
parents:
17511
diff
changeset
|
3398 if (char_table_depth >= 3) |
208d71ea3a4f
(get_keyelt): Handle an indirect entry with meta char.
Richard M. Stallman <rms@gnu.org>
parents:
17511
diff
changeset
|
3399 /* A char-table is never that deep. */ |
17327
0cb065f8702e
(describe_vector): Adjusted for the new structure of Lisp_Char_Table.
Kenichi Handa <handa@m17n.org>
parents:
17264
diff
changeset
|
3400 error ("Too deep char table"); |
17036 | 3401 |
3402 complete_char | |
17788
208d71ea3a4f
(get_keyelt): Handle an indirect entry with meta char.
Richard M. Stallman <rms@gnu.org>
parents:
17511
diff
changeset
|
3403 = (CHARSET_VALID_P (indices[0]) |
208d71ea3a4f
(get_keyelt): Handle an indirect entry with meta char.
Richard M. Stallman <rms@gnu.org>
parents:
17511
diff
changeset
|
3404 && ((CHARSET_DIMENSION (indices[0]) == 1 |
208d71ea3a4f
(get_keyelt): Handle an indirect entry with meta char.
Richard M. Stallman <rms@gnu.org>
parents:
17511
diff
changeset
|
3405 && char_table_depth == 1) |
208d71ea3a4f
(get_keyelt): Handle an indirect entry with meta char.
Richard M. Stallman <rms@gnu.org>
parents:
17511
diff
changeset
|
3406 || char_table_depth == 2)); |
17036 | 3407 |
3408 /* Meaningful elements are from 32th to 127th. */ | |
3409 from = 32; | |
17327
0cb065f8702e
(describe_vector): Adjusted for the new structure of Lisp_Char_Table.
Kenichi Handa <handa@m17n.org>
parents:
17264
diff
changeset
|
3410 to = SUB_CHAR_TABLE_ORDINARY_SLOTS; |
17036 | 3411 } |
3412 } | |
3413 else | |
3414 { | |
17788
208d71ea3a4f
(get_keyelt): Handle an indirect entry with meta char.
Richard M. Stallman <rms@gnu.org>
parents:
17511
diff
changeset
|
3415 /* This does the right thing for ordinary vectors. */ |
208d71ea3a4f
(get_keyelt): Handle an indirect entry with meta char.
Richard M. Stallman <rms@gnu.org>
parents:
17511
diff
changeset
|
3416 |
208d71ea3a4f
(get_keyelt): Handle an indirect entry with meta char.
Richard M. Stallman <rms@gnu.org>
parents:
17511
diff
changeset
|
3417 complete_char = 1; |
17036 | 3418 from = 0; |
17788
208d71ea3a4f
(get_keyelt): Handle an indirect entry with meta char.
Richard M. Stallman <rms@gnu.org>
parents:
17511
diff
changeset
|
3419 to = XVECTOR (vector)->size; |
17036 | 3420 } |
3421 | |
3422 for (i = from; i < to; i++) | |
250 | 3423 { |
60066
eca75f16d020
(describe_map_tree): New arg MENTION_SHADOW. Calls changed.
Richard M. Stallman <rms@gnu.org>
parents:
59754
diff
changeset
|
3424 int this_shadowed = 0; |
250 | 3425 QUIT; |
17189
7c008ec99e97
(describe_vector): Adjusted for the change of CHAR_TABLE_ORDINARY_SLOTS.
Kenichi Handa <handa@m17n.org>
parents:
17111
diff
changeset
|
3426 |
17327
0cb065f8702e
(describe_vector): Adjusted for the new structure of Lisp_Char_Table.
Kenichi Handa <handa@m17n.org>
parents:
17264
diff
changeset
|
3427 if (CHAR_TABLE_P (vector)) |
0cb065f8702e
(describe_vector): Adjusted for the new structure of Lisp_Char_Table.
Kenichi Handa <handa@m17n.org>
parents:
17264
diff
changeset
|
3428 { |
17788
208d71ea3a4f
(get_keyelt): Handle an indirect entry with meta char.
Richard M. Stallman <rms@gnu.org>
parents:
17511
diff
changeset
|
3429 if (char_table_depth == 0 && i >= CHAR_TABLE_SINGLE_BYTE_SLOTS) |
208d71ea3a4f
(get_keyelt): Handle an indirect entry with meta char.
Richard M. Stallman <rms@gnu.org>
parents:
17511
diff
changeset
|
3430 complete_char = 0; |
208d71ea3a4f
(get_keyelt): Handle an indirect entry with meta char.
Richard M. Stallman <rms@gnu.org>
parents:
17511
diff
changeset
|
3431 |
17327
0cb065f8702e
(describe_vector): Adjusted for the new structure of Lisp_Char_Table.
Kenichi Handa <handa@m17n.org>
parents:
17264
diff
changeset
|
3432 if (i >= CHAR_TABLE_SINGLE_BYTE_SLOTS |
0cb065f8702e
(describe_vector): Adjusted for the new structure of Lisp_Char_Table.
Kenichi Handa <handa@m17n.org>
parents:
17264
diff
changeset
|
3433 && !CHARSET_DEFINED_P (i - 128)) |
0cb065f8702e
(describe_vector): Adjusted for the new structure of Lisp_Char_Table.
Kenichi Handa <handa@m17n.org>
parents:
17264
diff
changeset
|
3434 continue; |
17788
208d71ea3a4f
(get_keyelt): Handle an indirect entry with meta char.
Richard M. Stallman <rms@gnu.org>
parents:
17511
diff
changeset
|
3435 |
208d71ea3a4f
(get_keyelt): Handle an indirect entry with meta char.
Richard M. Stallman <rms@gnu.org>
parents:
17511
diff
changeset
|
3436 definition |
208d71ea3a4f
(get_keyelt): Handle an indirect entry with meta char.
Richard M. Stallman <rms@gnu.org>
parents:
17511
diff
changeset
|
3437 = get_keyelt (XCHAR_TABLE (vector)->contents[i], 0); |
17327
0cb065f8702e
(describe_vector): Adjusted for the new structure of Lisp_Char_Table.
Kenichi Handa <handa@m17n.org>
parents:
17264
diff
changeset
|
3438 } |
0cb065f8702e
(describe_vector): Adjusted for the new structure of Lisp_Char_Table.
Kenichi Handa <handa@m17n.org>
parents:
17264
diff
changeset
|
3439 else |
32846
c1b3ab2a1ccc
Use AREF, ASET and ASIZE macros.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
32844
diff
changeset
|
3440 definition = get_keyelt (AREF (vector, i), 0); |
250 | 3441 |
41293
3db86c7bf56f
(Fdescribe_vector): Add `describer' parameter.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
41001
diff
changeset
|
3442 if (NILP (definition)) continue; |
17511
10ead0052174
(describe_vector): Test for suppressed commands in
Richard M. Stallman <rms@gnu.org>
parents:
17510
diff
changeset
|
3443 |
250 | 3444 /* Don't mention suppressed commands. */ |
11973
4e0f3e3b4cc7
(describe_vector): New arg entire_map.
Karl Heuer <kwzh@gnu.org>
parents:
11924
diff
changeset
|
3445 if (SYMBOLP (definition) && partial) |
250 | 3446 { |
17036 | 3447 Lisp_Object tem; |
3448 | |
3449 tem = Fget (definition, suppress); | |
3450 | |
3451 if (!NILP (tem)) continue; | |
250 | 3452 } |
3453 | |
17788
208d71ea3a4f
(get_keyelt): Handle an indirect entry with meta char.
Richard M. Stallman <rms@gnu.org>
parents:
17511
diff
changeset
|
3454 /* Set CHARACTER to the character this entry describes, if any. |
208d71ea3a4f
(get_keyelt): Handle an indirect entry with meta char.
Richard M. Stallman <rms@gnu.org>
parents:
17511
diff
changeset
|
3455 Also update *INDICES. */ |
208d71ea3a4f
(get_keyelt): Handle an indirect entry with meta char.
Richard M. Stallman <rms@gnu.org>
parents:
17511
diff
changeset
|
3456 if (CHAR_TABLE_P (vector)) |
208d71ea3a4f
(get_keyelt): Handle an indirect entry with meta char.
Richard M. Stallman <rms@gnu.org>
parents:
17511
diff
changeset
|
3457 { |
208d71ea3a4f
(get_keyelt): Handle an indirect entry with meta char.
Richard M. Stallman <rms@gnu.org>
parents:
17511
diff
changeset
|
3458 indices[char_table_depth] = i; |
208d71ea3a4f
(get_keyelt): Handle an indirect entry with meta char.
Richard M. Stallman <rms@gnu.org>
parents:
17511
diff
changeset
|
3459 |
208d71ea3a4f
(get_keyelt): Handle an indirect entry with meta char.
Richard M. Stallman <rms@gnu.org>
parents:
17511
diff
changeset
|
3460 if (char_table_depth == 0) |
208d71ea3a4f
(get_keyelt): Handle an indirect entry with meta char.
Richard M. Stallman <rms@gnu.org>
parents:
17511
diff
changeset
|
3461 { |
208d71ea3a4f
(get_keyelt): Handle an indirect entry with meta char.
Richard M. Stallman <rms@gnu.org>
parents:
17511
diff
changeset
|
3462 character = i; |
208d71ea3a4f
(get_keyelt): Handle an indirect entry with meta char.
Richard M. Stallman <rms@gnu.org>
parents:
17511
diff
changeset
|
3463 indices[0] = i - 128; |
208d71ea3a4f
(get_keyelt): Handle an indirect entry with meta char.
Richard M. Stallman <rms@gnu.org>
parents:
17511
diff
changeset
|
3464 } |
208d71ea3a4f
(get_keyelt): Handle an indirect entry with meta char.
Richard M. Stallman <rms@gnu.org>
parents:
17511
diff
changeset
|
3465 else if (complete_char) |
208d71ea3a4f
(get_keyelt): Handle an indirect entry with meta char.
Richard M. Stallman <rms@gnu.org>
parents:
17511
diff
changeset
|
3466 { |
29013
b9565b4bcdf8
(Fsingle_key_description): Use SPLIT_CHAR instead of
Kenichi Handa <handa@m17n.org>
parents:
26864
diff
changeset
|
3467 character = MAKE_CHAR (indices[0], indices[1], indices[2]); |
17788
208d71ea3a4f
(get_keyelt): Handle an indirect entry with meta char.
Richard M. Stallman <rms@gnu.org>
parents:
17511
diff
changeset
|
3468 } |
208d71ea3a4f
(get_keyelt): Handle an indirect entry with meta char.
Richard M. Stallman <rms@gnu.org>
parents:
17511
diff
changeset
|
3469 else |
208d71ea3a4f
(get_keyelt): Handle an indirect entry with meta char.
Richard M. Stallman <rms@gnu.org>
parents:
17511
diff
changeset
|
3470 character = 0; |
208d71ea3a4f
(get_keyelt): Handle an indirect entry with meta char.
Richard M. Stallman <rms@gnu.org>
parents:
17511
diff
changeset
|
3471 } |
208d71ea3a4f
(get_keyelt): Handle an indirect entry with meta char.
Richard M. Stallman <rms@gnu.org>
parents:
17511
diff
changeset
|
3472 else |
208d71ea3a4f
(get_keyelt): Handle an indirect entry with meta char.
Richard M. Stallman <rms@gnu.org>
parents:
17511
diff
changeset
|
3473 character = i; |
208d71ea3a4f
(get_keyelt): Handle an indirect entry with meta char.
Richard M. Stallman <rms@gnu.org>
parents:
17511
diff
changeset
|
3474 |
54925
f0a7441d22f6
(Fkey_description): Add optional PREFIX arg.
Kim F. Storm <storm@cua.dk>
parents:
53808
diff
changeset
|
3475 ASET (kludge, 0, make_number (character)); |
f0a7441d22f6
(Fkey_description): Add optional PREFIX arg.
Kim F. Storm <storm@cua.dk>
parents:
53808
diff
changeset
|
3476 |
11973
4e0f3e3b4cc7
(describe_vector): New arg entire_map.
Karl Heuer <kwzh@gnu.org>
parents:
11924
diff
changeset
|
3477 /* If this binding is shadowed by some other map, ignore it. */ |
17788
208d71ea3a4f
(get_keyelt): Handle an indirect entry with meta char.
Richard M. Stallman <rms@gnu.org>
parents:
17511
diff
changeset
|
3478 if (!NILP (shadow) && complete_char) |
250 | 3479 { |
3480 Lisp_Object tem; | |
45279
220c13a65624
(keymap_parent): New fun, extracted from Fkeymap_parent.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
45235
diff
changeset
|
3481 |
3952
f9dfc2872fb0
(describe_map_tree): Insert key_heading here.
Richard M. Stallman <rms@gnu.org>
parents:
3908
diff
changeset
|
3482 tem = shadow_lookup (shadow, kludge, Qt); |
250 | 3483 |
60066
eca75f16d020
(describe_map_tree): New arg MENTION_SHADOW. Calls changed.
Richard M. Stallman <rms@gnu.org>
parents:
59754
diff
changeset
|
3484 if (!NILP (tem)) |
eca75f16d020
(describe_map_tree): New arg MENTION_SHADOW. Calls changed.
Richard M. Stallman <rms@gnu.org>
parents:
59754
diff
changeset
|
3485 { |
eca75f16d020
(describe_map_tree): New arg MENTION_SHADOW. Calls changed.
Richard M. Stallman <rms@gnu.org>
parents:
59754
diff
changeset
|
3486 if (mention_shadow) |
eca75f16d020
(describe_map_tree): New arg MENTION_SHADOW. Calls changed.
Richard M. Stallman <rms@gnu.org>
parents:
59754
diff
changeset
|
3487 this_shadowed = 1; |
eca75f16d020
(describe_map_tree): New arg MENTION_SHADOW. Calls changed.
Richard M. Stallman <rms@gnu.org>
parents:
59754
diff
changeset
|
3488 else |
eca75f16d020
(describe_map_tree): New arg MENTION_SHADOW. Calls changed.
Richard M. Stallman <rms@gnu.org>
parents:
59754
diff
changeset
|
3489 continue; |
eca75f16d020
(describe_map_tree): New arg MENTION_SHADOW. Calls changed.
Richard M. Stallman <rms@gnu.org>
parents:
59754
diff
changeset
|
3490 } |
250 | 3491 } |
3492 | |
11973
4e0f3e3b4cc7
(describe_vector): New arg entire_map.
Karl Heuer <kwzh@gnu.org>
parents:
11924
diff
changeset
|
3493 /* 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
|
3494 one in the same keymap. */ |
17788
208d71ea3a4f
(get_keyelt): Handle an indirect entry with meta char.
Richard M. Stallman <rms@gnu.org>
parents:
17511
diff
changeset
|
3495 if (!NILP (entire_map) && complete_char) |
11973
4e0f3e3b4cc7
(describe_vector): New arg entire_map.
Karl Heuer <kwzh@gnu.org>
parents:
11924
diff
changeset
|
3496 { |
4e0f3e3b4cc7
(describe_vector): New arg entire_map.
Karl Heuer <kwzh@gnu.org>
parents:
11924
diff
changeset
|
3497 Lisp_Object tem; |
4e0f3e3b4cc7
(describe_vector): New arg entire_map.
Karl Heuer <kwzh@gnu.org>
parents:
11924
diff
changeset
|
3498 |
4e0f3e3b4cc7
(describe_vector): New arg entire_map.
Karl Heuer <kwzh@gnu.org>
parents:
11924
diff
changeset
|
3499 tem = Flookup_key (entire_map, kludge, Qt); |
4e0f3e3b4cc7
(describe_vector): New arg entire_map.
Karl Heuer <kwzh@gnu.org>
parents:
11924
diff
changeset
|
3500 |
39689
0572449a62be
(Fkeymap_prompt, Fcurrent_active_maps): New funs.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
39682
diff
changeset
|
3501 if (!EQ (tem, definition)) |
11973
4e0f3e3b4cc7
(describe_vector): New arg entire_map.
Karl Heuer <kwzh@gnu.org>
parents:
11924
diff
changeset
|
3502 continue; |
4e0f3e3b4cc7
(describe_vector): New arg entire_map.
Karl Heuer <kwzh@gnu.org>
parents:
11924
diff
changeset
|
3503 } |
4e0f3e3b4cc7
(describe_vector): New arg entire_map.
Karl Heuer <kwzh@gnu.org>
parents:
11924
diff
changeset
|
3504 |
250 | 3505 if (first) |
3506 { | |
17788
208d71ea3a4f
(get_keyelt): Handle an indirect entry with meta char.
Richard M. Stallman <rms@gnu.org>
parents:
17511
diff
changeset
|
3507 if (char_table_depth == 0) |
17036 | 3508 insert ("\n", 1); |
250 | 3509 first = 0; |
3510 } | |
3511 | |
17788
208d71ea3a4f
(get_keyelt): Handle an indirect entry with meta char.
Richard M. Stallman <rms@gnu.org>
parents:
17511
diff
changeset
|
3512 /* For a sub char-table, show the depth by indentation. |
208d71ea3a4f
(get_keyelt): Handle an indirect entry with meta char.
Richard M. Stallman <rms@gnu.org>
parents:
17511
diff
changeset
|
3513 CHAR_TABLE_DEPTH can be greater than 0 only for a char-table. */ |
208d71ea3a4f
(get_keyelt): Handle an indirect entry with meta char.
Richard M. Stallman <rms@gnu.org>
parents:
17511
diff
changeset
|
3514 if (char_table_depth > 0) |
208d71ea3a4f
(get_keyelt): Handle an indirect entry with meta char.
Richard M. Stallman <rms@gnu.org>
parents:
17511
diff
changeset
|
3515 insert (" ", char_table_depth * 2); /* depth is 1 or 2. */ |
208d71ea3a4f
(get_keyelt): Handle an indirect entry with meta char.
Richard M. Stallman <rms@gnu.org>
parents:
17511
diff
changeset
|
3516 |
208d71ea3a4f
(get_keyelt): Handle an indirect entry with meta char.
Richard M. Stallman <rms@gnu.org>
parents:
17511
diff
changeset
|
3517 /* 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
|
3518 if (!NILP (elt_prefix)) |
208d71ea3a4f
(get_keyelt): Handle an indirect entry with meta char.
Richard M. Stallman <rms@gnu.org>
parents:
17511
diff
changeset
|
3519 insert1 (elt_prefix); |
208d71ea3a4f
(get_keyelt): Handle an indirect entry with meta char.
Richard M. Stallman <rms@gnu.org>
parents:
17511
diff
changeset
|
3520 |
208d71ea3a4f
(get_keyelt): Handle an indirect entry with meta char.
Richard M. Stallman <rms@gnu.org>
parents:
17511
diff
changeset
|
3521 /* Insert or describe the character this slot is for, |
208d71ea3a4f
(get_keyelt): Handle an indirect entry with meta char.
Richard M. Stallman <rms@gnu.org>
parents:
17511
diff
changeset
|
3522 or a description of what it is for. */ |
208d71ea3a4f
(get_keyelt): Handle an indirect entry with meta char.
Richard M. Stallman <rms@gnu.org>
parents:
17511
diff
changeset
|
3523 if (SUB_CHAR_TABLE_P (vector)) |
17327
0cb065f8702e
(describe_vector): Adjusted for the new structure of Lisp_Char_Table.
Kenichi Handa <handa@m17n.org>
parents:
17264
diff
changeset
|
3524 { |
17788
208d71ea3a4f
(get_keyelt): Handle an indirect entry with meta char.
Richard M. Stallman <rms@gnu.org>
parents:
17511
diff
changeset
|
3525 if (complete_char) |
208d71ea3a4f
(get_keyelt): Handle an indirect entry with meta char.
Richard M. Stallman <rms@gnu.org>
parents:
17511
diff
changeset
|
3526 insert_char (character); |
208d71ea3a4f
(get_keyelt): Handle an indirect entry with meta char.
Richard M. Stallman <rms@gnu.org>
parents:
17511
diff
changeset
|
3527 else |
208d71ea3a4f
(get_keyelt): Handle an indirect entry with meta char.
Richard M. Stallman <rms@gnu.org>
parents:
17511
diff
changeset
|
3528 { |
208d71ea3a4f
(get_keyelt): Handle an indirect entry with meta char.
Richard M. Stallman <rms@gnu.org>
parents:
17511
diff
changeset
|
3529 /* We need an octal representation for this block of |
208d71ea3a4f
(get_keyelt): Handle an indirect entry with meta char.
Richard M. Stallman <rms@gnu.org>
parents:
17511
diff
changeset
|
3530 characters. */ |
17795
41b7d56b62fb
(describe_vector): Identify charset row numbers clearly.
Richard M. Stallman <rms@gnu.org>
parents:
17788
diff
changeset
|
3531 char work[16]; |
41b7d56b62fb
(describe_vector): Identify charset row numbers clearly.
Richard M. Stallman <rms@gnu.org>
parents:
17788
diff
changeset
|
3532 sprintf (work, "(row %d)", i); |
41b7d56b62fb
(describe_vector): Identify charset row numbers clearly.
Richard M. Stallman <rms@gnu.org>
parents:
17788
diff
changeset
|
3533 insert (work, strlen (work)); |
17788
208d71ea3a4f
(get_keyelt): Handle an indirect entry with meta char.
Richard M. Stallman <rms@gnu.org>
parents:
17511
diff
changeset
|
3534 } |
208d71ea3a4f
(get_keyelt): Handle an indirect entry with meta char.
Richard M. Stallman <rms@gnu.org>
parents:
17511
diff
changeset
|
3535 } |
208d71ea3a4f
(get_keyelt): Handle an indirect entry with meta char.
Richard M. Stallman <rms@gnu.org>
parents:
17511
diff
changeset
|
3536 else if (CHAR_TABLE_P (vector)) |
208d71ea3a4f
(get_keyelt): Handle an indirect entry with meta char.
Richard M. Stallman <rms@gnu.org>
parents:
17511
diff
changeset
|
3537 { |
208d71ea3a4f
(get_keyelt): Handle an indirect entry with meta char.
Richard M. Stallman <rms@gnu.org>
parents:
17511
diff
changeset
|
3538 if (complete_char) |
54925
f0a7441d22f6
(Fkey_description): Add optional PREFIX arg.
Kim F. Storm <storm@cua.dk>
parents:
53808
diff
changeset
|
3539 insert1 (Fkey_description (kludge, prefix)); |
17327
0cb065f8702e
(describe_vector): Adjusted for the new structure of Lisp_Char_Table.
Kenichi Handa <handa@m17n.org>
parents:
17264
diff
changeset
|
3540 else |
0cb065f8702e
(describe_vector): Adjusted for the new structure of Lisp_Char_Table.
Kenichi Handa <handa@m17n.org>
parents:
17264
diff
changeset
|
3541 { |
0cb065f8702e
(describe_vector): Adjusted for the new structure of Lisp_Char_Table.
Kenichi Handa <handa@m17n.org>
parents:
17264
diff
changeset
|
3542 /* Print the information for this character set. */ |
0cb065f8702e
(describe_vector): Adjusted for the new structure of Lisp_Char_Table.
Kenichi Handa <handa@m17n.org>
parents:
17264
diff
changeset
|
3543 insert_string ("<"); |
0cb065f8702e
(describe_vector): Adjusted for the new structure of Lisp_Char_Table.
Kenichi Handa <handa@m17n.org>
parents:
17264
diff
changeset
|
3544 tem2 = CHARSET_TABLE_INFO (i - 128, CHARSET_SHORT_NAME_IDX); |
0cb065f8702e
(describe_vector): Adjusted for the new structure of Lisp_Char_Table.
Kenichi Handa <handa@m17n.org>
parents:
17264
diff
changeset
|
3545 if (STRINGP (tem2)) |
46370
40db0673e6f0
Most uses of XSTRING combined with STRING_BYTES or indirection changed to
Ken Raeburn <raeburn@raeburn.org>
parents:
46310
diff
changeset
|
3546 insert_from_string (tem2, 0, 0, SCHARS (tem2), |
40db0673e6f0
Most uses of XSTRING combined with STRING_BYTES or indirection changed to
Ken Raeburn <raeburn@raeburn.org>
parents:
46310
diff
changeset
|
3547 SBYTES (tem2), 0); |
17327
0cb065f8702e
(describe_vector): Adjusted for the new structure of Lisp_Char_Table.
Kenichi Handa <handa@m17n.org>
parents:
17264
diff
changeset
|
3548 else |
0cb065f8702e
(describe_vector): Adjusted for the new structure of Lisp_Char_Table.
Kenichi Handa <handa@m17n.org>
parents:
17264
diff
changeset
|
3549 insert ("?", 1); |
0cb065f8702e
(describe_vector): Adjusted for the new structure of Lisp_Char_Table.
Kenichi Handa <handa@m17n.org>
parents:
17264
diff
changeset
|
3550 insert (">", 1); |
0cb065f8702e
(describe_vector): Adjusted for the new structure of Lisp_Char_Table.
Kenichi Handa <handa@m17n.org>
parents:
17264
diff
changeset
|
3551 } |
0cb065f8702e
(describe_vector): Adjusted for the new structure of Lisp_Char_Table.
Kenichi Handa <handa@m17n.org>
parents:
17264
diff
changeset
|
3552 } |
13201
e9007fec678e
(describe_vector): Support nested char-tables.
Richard M. Stallman <rms@gnu.org>
parents:
13145
diff
changeset
|
3553 else |
e9007fec678e
(describe_vector): Support nested char-tables.
Richard M. Stallman <rms@gnu.org>
parents:
13145
diff
changeset
|
3554 { |
54925
f0a7441d22f6
(Fkey_description): Add optional PREFIX arg.
Kim F. Storm <storm@cua.dk>
parents:
53808
diff
changeset
|
3555 insert1 (Fkey_description (kludge, prefix)); |
17036 | 3556 } |
3557 | |
17327
0cb065f8702e
(describe_vector): Adjusted for the new structure of Lisp_Char_Table.
Kenichi Handa <handa@m17n.org>
parents:
17264
diff
changeset
|
3558 /* If we find a sub char-table within a char-table, |
17036 | 3559 scan it recursively; it defines the details for |
3560 a character set or a portion of a character set. */ | |
20624
9ac0b485cf60
(describe_vector): Unconditionally handle multibyte chars.
Richard M. Stallman <rms@gnu.org>
parents:
20576
diff
changeset
|
3561 if (CHAR_TABLE_P (vector) && SUB_CHAR_TABLE_P (definition)) |
17036 | 3562 { |
3563 insert ("\n", 1); | |
54925
f0a7441d22f6
(Fkey_description): Add optional PREFIX arg.
Kim F. Storm <storm@cua.dk>
parents:
53808
diff
changeset
|
3564 describe_vector (definition, prefix, args, elt_describer, |
17788
208d71ea3a4f
(get_keyelt): Handle an indirect entry with meta char.
Richard M. Stallman <rms@gnu.org>
parents:
17511
diff
changeset
|
3565 partial, shadow, entire_map, |
60066
eca75f16d020
(describe_map_tree): New arg MENTION_SHADOW. Calls changed.
Richard M. Stallman <rms@gnu.org>
parents:
59754
diff
changeset
|
3566 indices, char_table_depth + 1, keymap_p, |
eca75f16d020
(describe_map_tree): New arg MENTION_SHADOW. Calls changed.
Richard M. Stallman <rms@gnu.org>
parents:
59754
diff
changeset
|
3567 mention_shadow); |
17036 | 3568 continue; |
13201
e9007fec678e
(describe_vector): Support nested char-tables.
Richard M. Stallman <rms@gnu.org>
parents:
13145
diff
changeset
|
3569 } |
250 | 3570 |
17788
208d71ea3a4f
(get_keyelt): Handle an indirect entry with meta char.
Richard M. Stallman <rms@gnu.org>
parents:
17511
diff
changeset
|
3571 starting_i = i; |
208d71ea3a4f
(get_keyelt): Handle an indirect entry with meta char.
Richard M. Stallman <rms@gnu.org>
parents:
17511
diff
changeset
|
3572 |
17795
41b7d56b62fb
(describe_vector): Identify charset row numbers clearly.
Richard M. Stallman <rms@gnu.org>
parents:
17788
diff
changeset
|
3573 /* Find all consecutive characters or rows that have the same |
17327
0cb065f8702e
(describe_vector): Adjusted for the new structure of Lisp_Char_Table.
Kenichi Handa <handa@m17n.org>
parents:
17264
diff
changeset
|
3574 definition. But, for elements of a top level char table, if |
0cb065f8702e
(describe_vector): Adjusted for the new structure of Lisp_Char_Table.
Kenichi Handa <handa@m17n.org>
parents:
17264
diff
changeset
|
3575 they are for charsets, we had better describe one by one even |
0cb065f8702e
(describe_vector): Adjusted for the new structure of Lisp_Char_Table.
Kenichi Handa <handa@m17n.org>
parents:
17264
diff
changeset
|
3576 if they have the same definition. */ |
0cb065f8702e
(describe_vector): Adjusted for the new structure of Lisp_Char_Table.
Kenichi Handa <handa@m17n.org>
parents:
17264
diff
changeset
|
3577 if (CHAR_TABLE_P (vector)) |
0cb065f8702e
(describe_vector): Adjusted for the new structure of Lisp_Char_Table.
Kenichi Handa <handa@m17n.org>
parents:
17264
diff
changeset
|
3578 { |
17788
208d71ea3a4f
(get_keyelt): Handle an indirect entry with meta char.
Richard M. Stallman <rms@gnu.org>
parents:
17511
diff
changeset
|
3579 int limit = to; |
208d71ea3a4f
(get_keyelt): Handle an indirect entry with meta char.
Richard M. Stallman <rms@gnu.org>
parents:
17511
diff
changeset
|
3580 |
208d71ea3a4f
(get_keyelt): Handle an indirect entry with meta char.
Richard M. Stallman <rms@gnu.org>
parents:
17511
diff
changeset
|
3581 if (char_table_depth == 0) |
208d71ea3a4f
(get_keyelt): Handle an indirect entry with meta char.
Richard M. Stallman <rms@gnu.org>
parents:
17511
diff
changeset
|
3582 limit = CHAR_TABLE_SINGLE_BYTE_SLOTS; |
208d71ea3a4f
(get_keyelt): Handle an indirect entry with meta char.
Richard M. Stallman <rms@gnu.org>
parents:
17511
diff
changeset
|
3583 |
208d71ea3a4f
(get_keyelt): Handle an indirect entry with meta char.
Richard M. Stallman <rms@gnu.org>
parents:
17511
diff
changeset
|
3584 while (i + 1 < limit |
208d71ea3a4f
(get_keyelt): Handle an indirect entry with meta char.
Richard M. Stallman <rms@gnu.org>
parents:
17511
diff
changeset
|
3585 && (tem2 = get_keyelt (XCHAR_TABLE (vector)->contents[i + 1], 0), |
208d71ea3a4f
(get_keyelt): Handle an indirect entry with meta char.
Richard M. Stallman <rms@gnu.org>
parents:
17511
diff
changeset
|
3586 !NILP (tem2)) |
208d71ea3a4f
(get_keyelt): Handle an indirect entry with meta char.
Richard M. Stallman <rms@gnu.org>
parents:
17511
diff
changeset
|
3587 && !NILP (Fequal (tem2, definition))) |
208d71ea3a4f
(get_keyelt): Handle an indirect entry with meta char.
Richard M. Stallman <rms@gnu.org>
parents:
17511
diff
changeset
|
3588 i++; |
17327
0cb065f8702e
(describe_vector): Adjusted for the new structure of Lisp_Char_Table.
Kenichi Handa <handa@m17n.org>
parents:
17264
diff
changeset
|
3589 } |
0cb065f8702e
(describe_vector): Adjusted for the new structure of Lisp_Char_Table.
Kenichi Handa <handa@m17n.org>
parents:
17264
diff
changeset
|
3590 else |
17788
208d71ea3a4f
(get_keyelt): Handle an indirect entry with meta char.
Richard M. Stallman <rms@gnu.org>
parents:
17511
diff
changeset
|
3591 while (i + 1 < to |
32846
c1b3ab2a1ccc
Use AREF, ASET and ASIZE macros.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
32844
diff
changeset
|
3592 && (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
|
3593 !NILP (tem2)) |
0cb065f8702e
(describe_vector): Adjusted for the new structure of Lisp_Char_Table.
Kenichi Handa <handa@m17n.org>
parents:
17264
diff
changeset
|
3594 && !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
|
3595 i++; |
45279
220c13a65624
(keymap_parent): New fun, extracted from Fkeymap_parent.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
45235
diff
changeset
|
3596 |
250 | 3597 |
3598 /* If we have a range of more than one character, | |
3599 print where the range reaches to. */ | |
3600 | |
17788
208d71ea3a4f
(get_keyelt): Handle an indirect entry with meta char.
Richard M. Stallman <rms@gnu.org>
parents:
17511
diff
changeset
|
3601 if (i != starting_i) |
250 | 3602 { |
3603 insert (" .. ", 4); | |
17788
208d71ea3a4f
(get_keyelt): Handle an indirect entry with meta char.
Richard M. Stallman <rms@gnu.org>
parents:
17511
diff
changeset
|
3604 |
54925
f0a7441d22f6
(Fkey_description): Add optional PREFIX arg.
Kim F. Storm <storm@cua.dk>
parents:
53808
diff
changeset
|
3605 ASET (kludge, 0, make_number (i)); |
f0a7441d22f6
(Fkey_description): Add optional PREFIX arg.
Kim F. Storm <storm@cua.dk>
parents:
53808
diff
changeset
|
3606 |
17788
208d71ea3a4f
(get_keyelt): Handle an indirect entry with meta char.
Richard M. Stallman <rms@gnu.org>
parents:
17511
diff
changeset
|
3607 if (!NILP (elt_prefix)) |
208d71ea3a4f
(get_keyelt): Handle an indirect entry with meta char.
Richard M. Stallman <rms@gnu.org>
parents:
17511
diff
changeset
|
3608 insert1 (elt_prefix); |
208d71ea3a4f
(get_keyelt): Handle an indirect entry with meta char.
Richard M. Stallman <rms@gnu.org>
parents:
17511
diff
changeset
|
3609 |
13201
e9007fec678e
(describe_vector): Support nested char-tables.
Richard M. Stallman <rms@gnu.org>
parents:
13145
diff
changeset
|
3610 if (CHAR_TABLE_P (vector)) |
e9007fec678e
(describe_vector): Support nested char-tables.
Richard M. Stallman <rms@gnu.org>
parents:
13145
diff
changeset
|
3611 { |
17788
208d71ea3a4f
(get_keyelt): Handle an indirect entry with meta char.
Richard M. Stallman <rms@gnu.org>
parents:
17511
diff
changeset
|
3612 if (char_table_depth == 0) |
208d71ea3a4f
(get_keyelt): Handle an indirect entry with meta char.
Richard M. Stallman <rms@gnu.org>
parents:
17511
diff
changeset
|
3613 { |
54925
f0a7441d22f6
(Fkey_description): Add optional PREFIX arg.
Kim F. Storm <storm@cua.dk>
parents:
53808
diff
changeset
|
3614 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
|
3615 } |
208d71ea3a4f
(get_keyelt): Handle an indirect entry with meta char.
Richard M. Stallman <rms@gnu.org>
parents:
17511
diff
changeset
|
3616 else if (complete_char) |
13201
e9007fec678e
(describe_vector): Support nested char-tables.
Richard M. Stallman <rms@gnu.org>
parents:
13145
diff
changeset
|
3617 { |
17788
208d71ea3a4f
(get_keyelt): Handle an indirect entry with meta char.
Richard M. Stallman <rms@gnu.org>
parents:
17511
diff
changeset
|
3618 indices[char_table_depth] = i; |
29013
b9565b4bcdf8
(Fsingle_key_description): Use SPLIT_CHAR instead of
Kenichi Handa <handa@m17n.org>
parents:
26864
diff
changeset
|
3619 character = MAKE_CHAR (indices[0], indices[1], indices[2]); |
17788
208d71ea3a4f
(get_keyelt): Handle an indirect entry with meta char.
Richard M. Stallman <rms@gnu.org>
parents:
17511
diff
changeset
|
3620 insert_char (character); |
17036 | 3621 } |
17788
208d71ea3a4f
(get_keyelt): Handle an indirect entry with meta char.
Richard M. Stallman <rms@gnu.org>
parents:
17511
diff
changeset
|
3622 else |
17036 | 3623 { |
17795
41b7d56b62fb
(describe_vector): Identify charset row numbers clearly.
Richard M. Stallman <rms@gnu.org>
parents:
17788
diff
changeset
|
3624 /* We need an octal representation for this block of |
41b7d56b62fb
(describe_vector): Identify charset row numbers clearly.
Richard M. Stallman <rms@gnu.org>
parents:
17788
diff
changeset
|
3625 characters. */ |
41b7d56b62fb
(describe_vector): Identify charset row numbers clearly.
Richard M. Stallman <rms@gnu.org>
parents:
17788
diff
changeset
|
3626 char work[16]; |
41b7d56b62fb
(describe_vector): Identify charset row numbers clearly.
Richard M. Stallman <rms@gnu.org>
parents:
17788
diff
changeset
|
3627 sprintf (work, "(row %d)", i); |
41b7d56b62fb
(describe_vector): Identify charset row numbers clearly.
Richard M. Stallman <rms@gnu.org>
parents:
17788
diff
changeset
|
3628 insert (work, strlen (work)); |
13201
e9007fec678e
(describe_vector): Support nested char-tables.
Richard M. Stallman <rms@gnu.org>
parents:
13145
diff
changeset
|
3629 } |
e9007fec678e
(describe_vector): Support nested char-tables.
Richard M. Stallman <rms@gnu.org>
parents:
13145
diff
changeset
|
3630 } |
e9007fec678e
(describe_vector): Support nested char-tables.
Richard M. Stallman <rms@gnu.org>
parents:
13145
diff
changeset
|
3631 else |
e9007fec678e
(describe_vector): Support nested char-tables.
Richard M. Stallman <rms@gnu.org>
parents:
13145
diff
changeset
|
3632 { |
54925
f0a7441d22f6
(Fkey_description): Add optional PREFIX arg.
Kim F. Storm <storm@cua.dk>
parents:
53808
diff
changeset
|
3633 insert1 (Fkey_description (kludge, prefix)); |
13201
e9007fec678e
(describe_vector): Support nested char-tables.
Richard M. Stallman <rms@gnu.org>
parents:
13145
diff
changeset
|
3634 } |
250 | 3635 } |
3636 | |
3637 /* Print a description of the definition of this character. | |
3638 elt_describer will take care of spacing out far enough | |
3639 for alignment purposes. */ | |
41293
3db86c7bf56f
(Fdescribe_vector): Add `describer' parameter.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
41001
diff
changeset
|
3640 (*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
|
3641 |
eca75f16d020
(describe_map_tree): New arg MENTION_SHADOW. Calls changed.
Richard M. Stallman <rms@gnu.org>
parents:
59754
diff
changeset
|
3642 if (this_shadowed) |
eca75f16d020
(describe_map_tree): New arg MENTION_SHADOW. Calls changed.
Richard M. Stallman <rms@gnu.org>
parents:
59754
diff
changeset
|
3643 { |
eca75f16d020
(describe_map_tree): New arg MENTION_SHADOW. Calls changed.
Richard M. Stallman <rms@gnu.org>
parents:
59754
diff
changeset
|
3644 SET_PT (PT - 1); |
eca75f16d020
(describe_map_tree): New arg MENTION_SHADOW. Calls changed.
Richard M. Stallman <rms@gnu.org>
parents:
59754
diff
changeset
|
3645 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
|
3646 SET_PT (PT + 1); |
eca75f16d020
(describe_map_tree): New arg MENTION_SHADOW. Calls changed.
Richard M. Stallman <rms@gnu.org>
parents:
59754
diff
changeset
|
3647 } |
250 | 3648 } |
3649 | |
17327
0cb065f8702e
(describe_vector): Adjusted for the new structure of Lisp_Char_Table.
Kenichi Handa <handa@m17n.org>
parents:
17264
diff
changeset
|
3650 /* For (sub) char-table, print `defalt' slot at last. */ |
17036 | 3651 if (CHAR_TABLE_P (vector) && !NILP (XCHAR_TABLE (vector)->defalt)) |
3652 { | |
17788
208d71ea3a4f
(get_keyelt): Handle an indirect entry with meta char.
Richard M. Stallman <rms@gnu.org>
parents:
17511
diff
changeset
|
3653 insert (" ", char_table_depth * 2); |
17036 | 3654 insert_string ("<<default>>"); |
41293
3db86c7bf56f
(Fdescribe_vector): Add `describer' parameter.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
41001
diff
changeset
|
3655 (*elt_describer) (XCHAR_TABLE (vector)->defalt, args); |
17036 | 3656 } |
3657 | |
250 | 3658 UNGCPRO; |
3659 } | |
3660 | |
465 | 3661 /* 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
|
3662 static Lisp_Object apropos_predicate; |
435da46787dd
(apropos_predicate, apropos_accumulate): Make them static.
Richard M. Stallman <rms@gnu.org>
parents:
46470
diff
changeset
|
3663 static Lisp_Object apropos_accumulate; |
250 | 3664 |
3665 static void | |
3666 apropos_accum (symbol, string) | |
3667 Lisp_Object symbol, string; | |
3668 { | |
3669 register Lisp_Object tem; | |
3670 | |
3671 tem = Fstring_match (string, Fsymbol_name (symbol), Qnil); | |
485 | 3672 if (!NILP (tem) && !NILP (apropos_predicate)) |
250 | 3673 tem = call1 (apropos_predicate, symbol); |
485 | 3674 if (!NILP (tem)) |
250 | 3675 apropos_accumulate = Fcons (symbol, apropos_accumulate); |
3676 } | |
3677 | |
45619
dbd65bd8bb4f
(describe_command): Cast `current_column' return value to int.
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
45404
diff
changeset
|
3678 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
|
3679 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
|
3680 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
|
3681 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
|
3682 Return list of symbols found. */) |
a17c8b15ef1b
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
40804
diff
changeset
|
3683 (regexp, predicate) |
14080
439185f0ef37
(Fkeymapp, Fdefine_prefix_command, Faccessible_keymaps,
Erik Naggum <erik@naggum.no>
parents:
13947
diff
changeset
|
3684 Lisp_Object regexp, predicate; |
250 | 3685 { |
49059
435da46787dd
(apropos_predicate, apropos_accumulate): Make them static.
Richard M. Stallman <rms@gnu.org>
parents:
46470
diff
changeset
|
3686 Lisp_Object tem; |
40656
cdfd4d09b79a
Update usage of CHECK_ macros (remove unused second argument).
Pavel Janík <Pavel@Janik.cz>
parents:
40625
diff
changeset
|
3687 CHECK_STRING (regexp); |
14080
439185f0ef37
(Fkeymapp, Fdefine_prefix_command, Faccessible_keymaps,
Erik Naggum <erik@naggum.no>
parents:
13947
diff
changeset
|
3688 apropos_predicate = predicate; |
250 | 3689 apropos_accumulate = Qnil; |
14080
439185f0ef37
(Fkeymapp, Fdefine_prefix_command, Faccessible_keymaps,
Erik Naggum <erik@naggum.no>
parents:
13947
diff
changeset
|
3690 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
|
3691 tem = Fsort (apropos_accumulate, Qstring_lessp); |
435da46787dd
(apropos_predicate, apropos_accumulate): Make them static.
Richard M. Stallman <rms@gnu.org>
parents:
46470
diff
changeset
|
3692 apropos_accumulate = Qnil; |
435da46787dd
(apropos_predicate, apropos_accumulate): Make them static.
Richard M. Stallman <rms@gnu.org>
parents:
46470
diff
changeset
|
3693 apropos_predicate = Qnil; |
435da46787dd
(apropos_predicate, apropos_accumulate): Make them static.
Richard M. Stallman <rms@gnu.org>
parents:
46470
diff
changeset
|
3694 return tem; |
250 | 3695 } |
3696 | |
21514 | 3697 void |
250 | 3698 syms_of_keymap () |
3699 { | |
3700 Qkeymap = intern ("keymap"); | |
3701 staticpro (&Qkeymap); | |
49059
435da46787dd
(apropos_predicate, apropos_accumulate): Make them static.
Richard M. Stallman <rms@gnu.org>
parents:
46470
diff
changeset
|
3702 staticpro (&apropos_predicate); |
435da46787dd
(apropos_predicate, apropos_accumulate): Make them static.
Richard M. Stallman <rms@gnu.org>
parents:
46470
diff
changeset
|
3703 staticpro (&apropos_accumulate); |
435da46787dd
(apropos_predicate, apropos_accumulate): Make them static.
Richard M. Stallman <rms@gnu.org>
parents:
46470
diff
changeset
|
3704 apropos_predicate = Qnil; |
435da46787dd
(apropos_predicate, apropos_accumulate): Make them static.
Richard M. Stallman <rms@gnu.org>
parents:
46470
diff
changeset
|
3705 apropos_accumulate = Qnil; |
250 | 3706 |
17788
208d71ea3a4f
(get_keyelt): Handle an indirect entry with meta char.
Richard M. Stallman <rms@gnu.org>
parents:
17511
diff
changeset
|
3707 /* 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
|
3708 create char tables. */ |
208d71ea3a4f
(get_keyelt): Handle an indirect entry with meta char.
Richard M. Stallman <rms@gnu.org>
parents:
17511
diff
changeset
|
3709 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
|
3710 |
208d71ea3a4f
(get_keyelt): Handle an indirect entry with meta char.
Richard M. Stallman <rms@gnu.org>
parents:
17511
diff
changeset
|
3711 /* 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
|
3712 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
|
3713 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
|
3714 |
208d71ea3a4f
(get_keyelt): Handle an indirect entry with meta char.
Richard M. Stallman <rms@gnu.org>
parents:
17511
diff
changeset
|
3715 global_map = Fmake_keymap (Qnil); |
250 | 3716 Fset (intern ("global-map"), global_map); |
3717 | |
16125
2e0a45264368
(syms_of_keymap): staticpro current_global_map;
Richard M. Stallman <rms@gnu.org>
parents:
15422
diff
changeset
|
3718 current_global_map = global_map; |
16227
6acf08913847
(syms_of_keymap): staticpro global_map.
Erik Naggum <erik@naggum.no>
parents:
16125
diff
changeset
|
3719 staticpro (&global_map); |
16125
2e0a45264368
(syms_of_keymap): staticpro current_global_map;
Richard M. Stallman <rms@gnu.org>
parents:
15422
diff
changeset
|
3720 staticpro (¤t_global_map); |
2e0a45264368
(syms_of_keymap): staticpro current_global_map;
Richard M. Stallman <rms@gnu.org>
parents:
15422
diff
changeset
|
3721 |
1095
6578f07e9eb8
(Fmake_sparse_keymap, Fmake_keymap): New optional arg. Callers changed.
Richard M. Stallman <rms@gnu.org>
parents:
647
diff
changeset
|
3722 meta_map = Fmake_keymap (Qnil); |
250 | 3723 Fset (intern ("esc-map"), meta_map); |
3724 Ffset (intern ("ESC-prefix"), meta_map); | |
3725 | |
1095
6578f07e9eb8
(Fmake_sparse_keymap, Fmake_keymap): New optional arg. Callers changed.
Richard M. Stallman <rms@gnu.org>
parents:
647
diff
changeset
|
3726 control_x_map = Fmake_keymap (Qnil); |
250 | 3727 Fset (intern ("ctl-x-map"), control_x_map); |
3728 Ffset (intern ("Control-X-prefix"), control_x_map); | |
3729 | |
42378
9f96219e833e
(Flookup_key): Add error message for trying to bind [DEL], [RET], etc.
Richard M. Stallman <rms@gnu.org>
parents:
42206
diff
changeset
|
3730 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
|
3731 = Fcons (Fcons (build_string ("DEL"), build_string ("\\d")), |
9f96219e833e
(Flookup_key): Add error message for trying to bind [DEL], [RET], etc.
Richard M. Stallman <rms@gnu.org>
parents:
42206
diff
changeset
|
3732 Fcons (Fcons (build_string ("TAB"), build_string ("\\t")), |
9f96219e833e
(Flookup_key): Add error message for trying to bind [DEL], [RET], etc.
Richard M. Stallman <rms@gnu.org>
parents:
42206
diff
changeset
|
3733 Fcons (Fcons (build_string ("RET"), build_string ("\\r")), |
9f96219e833e
(Flookup_key): Add error message for trying to bind [DEL], [RET], etc.
Richard M. Stallman <rms@gnu.org>
parents:
42206
diff
changeset
|
3734 Fcons (Fcons (build_string ("ESC"), build_string ("\\e")), |
9f96219e833e
(Flookup_key): Add error message for trying to bind [DEL], [RET], etc.
Richard M. Stallman <rms@gnu.org>
parents:
42206
diff
changeset
|
3735 Fcons (Fcons (build_string ("SPC"), build_string (" ")), |
9f96219e833e
(Flookup_key): Add error message for trying to bind [DEL], [RET], etc.
Richard M. Stallman <rms@gnu.org>
parents:
42206
diff
changeset
|
3736 Qnil))))); |
9f96219e833e
(Flookup_key): Add error message for trying to bind [DEL], [RET], etc.
Richard M. Stallman <rms@gnu.org>
parents:
42206
diff
changeset
|
3737 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
|
3738 |
12297
fe458a8ecfa2
(Vdefine_key_rebound_commands): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
12262
diff
changeset
|
3739 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
|
3740 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
|
3741 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
|
3742 don't alter it yourself. */); |
12297
fe458a8ecfa2
(Vdefine_key_rebound_commands): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
12262
diff
changeset
|
3743 Vdefine_key_rebound_commands = Qt; |
fe458a8ecfa2
(Vdefine_key_rebound_commands): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
12262
diff
changeset
|
3744 |
250 | 3745 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
|
3746 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
|
3747 Vminibuffer_local_map = Fmake_sparse_keymap (Qnil); |
250 | 3748 |
3749 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
|
3750 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
|
3751 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
|
3752 Fset_keymap_parent (Vminibuffer_local_ns_map, Vminibuffer_local_map); |
250 | 3753 |
3754 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
|
3755 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
|
3756 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
|
3757 Fset_keymap_parent (Vminibuffer_local_completion_map, Vminibuffer_local_map); |
250 | 3758 |
3759 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
|
3760 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
|
3761 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
|
3762 Fset_keymap_parent (Vminibuffer_local_must_match_map, |
ccaa40660e40
(Fkey_description): Use empty_string.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
39702
diff
changeset
|
3763 Vminibuffer_local_completion_map); |
250 | 3764 |
465 | 3765 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
|
3766 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
|
3767 Each element looks like (VARIABLE . KEYMAP); KEYMAP is used to read |
a17c8b15ef1b
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
40804
diff
changeset
|
3768 key sequences and look up bindings iff VARIABLE's value is non-nil. |
a17c8b15ef1b
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
40804
diff
changeset
|
3769 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
|
3770 in the list takes precedence. */); |
465 | 3771 Vminor_mode_map_alist = Qnil; |
3772 | |
20517
40bfe766d355
(Vminor_mode_overriding_map_alist): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
20381
diff
changeset
|
3773 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
|
3774 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
|
3775 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
|
3776 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
|
3777 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
|
3778 Vminor_mode_overriding_map_alist = Qnil; |
40bfe766d355
(Vminor_mode_overriding_map_alist): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
20381
diff
changeset
|
3779 |
45222
c525c7445e1b
(Vemulation_mode_map_alists): New variable.
Kim F. Storm <storm@cua.dk>
parents:
43504
diff
changeset
|
3780 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
|
3781 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
|
3782 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
|
3783 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
|
3784 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
|
3785 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
|
3786 `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
|
3787 Vemulation_mode_map_alists = Qnil; |
c525c7445e1b
(Vemulation_mode_map_alists): New variable.
Kim F. Storm <storm@cua.dk>
parents:
43504
diff
changeset
|
3788 |
c525c7445e1b
(Vemulation_mode_map_alists): New variable.
Kim F. Storm <storm@cua.dk>
parents:
43504
diff
changeset
|
3789 |
517 | 3790 DEFVAR_LISP ("function-key-map", &Vfunction_key_map, |
41001
a17c8b15ef1b
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
40804
diff
changeset
|
3791 doc: /* Keymap mapping ASCII function key sequences onto their preferred forms. |
a17c8b15ef1b
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
40804
diff
changeset
|
3792 This allows Emacs to recognize function keys sent from ASCII |
a17c8b15ef1b
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
40804
diff
changeset
|
3793 terminals at any point in a key sequence. |
a17c8b15ef1b
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
40804
diff
changeset
|
3794 |
a17c8b15ef1b
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
40804
diff
changeset
|
3795 The `read-key-sequence' function replaces any subsequence bound by |
a17c8b15ef1b
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
40804
diff
changeset
|
3796 `function-key-map' with its binding. More precisely, when the active |
a17c8b15ef1b
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
40804
diff
changeset
|
3797 keymaps have no binding for the current key sequence but |
a17c8b15ef1b
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
40804
diff
changeset
|
3798 `function-key-map' binds a suffix of the sequence to a vector or string, |
a17c8b15ef1b
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
40804
diff
changeset
|
3799 `read-key-sequence' replaces the matching suffix with its binding, and |
a17c8b15ef1b
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
40804
diff
changeset
|
3800 continues with the new sequence. |
a17c8b15ef1b
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
40804
diff
changeset
|
3801 |
a17c8b15ef1b
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
40804
diff
changeset
|
3802 The events that come from bindings in `function-key-map' are not |
a17c8b15ef1b
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
40804
diff
changeset
|
3803 themselves looked up in `function-key-map'. |
a17c8b15ef1b
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
40804
diff
changeset
|
3804 |
a17c8b15ef1b
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
40804
diff
changeset
|
3805 For example, suppose `function-key-map' binds `ESC O P' to [f1]. |
a17c8b15ef1b
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
40804
diff
changeset
|
3806 Typing `ESC O P' to `read-key-sequence' would return [f1]. Typing |
a17c8b15ef1b
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
40804
diff
changeset
|
3807 `C-x ESC O P' would return [?\\C-x f1]. If [f1] were a prefix |
a17c8b15ef1b
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
40804
diff
changeset
|
3808 key, typing `ESC O P x' would return [f1 x]. */); |
1095
6578f07e9eb8
(Fmake_sparse_keymap, Fmake_keymap): New optional arg. Callers changed.
Richard M. Stallman <rms@gnu.org>
parents:
647
diff
changeset
|
3809 Vfunction_key_map = Fmake_sparse_keymap (Qnil); |
517 | 3810 |
12710
26c09987d2f3
(describe_buffer_bindings): Print bindings from
Richard M. Stallman <rms@gnu.org>
parents:
12542
diff
changeset
|
3811 DEFVAR_LISP ("key-translation-map", &Vkey_translation_map, |
41001
a17c8b15ef1b
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
40804
diff
changeset
|
3812 doc: /* Keymap of key translations that can override keymaps. |
a17c8b15ef1b
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
40804
diff
changeset
|
3813 This keymap works like `function-key-map', but comes after that, |
56618
166ae6765a44
(Flocal_key_binding, Fglobal_key_binding)
Luc Teirlinck <teirllm@auburn.edu>
parents:
56574
diff
changeset
|
3814 and its non-prefix bindings override ordinary bindings. */); |
12710
26c09987d2f3
(describe_buffer_bindings): Print bindings from
Richard M. Stallman <rms@gnu.org>
parents:
12542
diff
changeset
|
3815 Vkey_translation_map = Qnil; |
26c09987d2f3
(describe_buffer_bindings): Print bindings from
Richard M. Stallman <rms@gnu.org>
parents:
12542
diff
changeset
|
3816 |
53808
aa6be081315b
(Vmouse_events): Rename from Vmenu_events.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
52740
diff
changeset
|
3817 staticpro (&Vmouse_events); |
aa6be081315b
(Vmouse_events): Rename from Vmenu_events.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
52740
diff
changeset
|
3818 Vmouse_events = Fcons (intern ("menu-bar"), |
aa6be081315b
(Vmouse_events): Rename from Vmenu_events.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
52740
diff
changeset
|
3819 Fcons (intern ("tool-bar"), |
aa6be081315b
(Vmouse_events): Rename from Vmenu_events.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
52740
diff
changeset
|
3820 Fcons (intern ("header-line"), |
aa6be081315b
(Vmouse_events): Rename from Vmenu_events.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
52740
diff
changeset
|
3821 Fcons (intern ("mode-line"), |
aa6be081315b
(Vmouse_events): Rename from Vmenu_events.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
52740
diff
changeset
|
3822 Fcons (intern ("mouse-1"), |
aa6be081315b
(Vmouse_events): Rename from Vmenu_events.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
52740
diff
changeset
|
3823 Fcons (intern ("mouse-2"), |
aa6be081315b
(Vmouse_events): Rename from Vmenu_events.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
52740
diff
changeset
|
3824 Fcons (intern ("mouse-3"), |
aa6be081315b
(Vmouse_events): Rename from Vmenu_events.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
52740
diff
changeset
|
3825 Fcons (intern ("mouse-4"), |
aa6be081315b
(Vmouse_events): Rename from Vmenu_events.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
52740
diff
changeset
|
3826 Fcons (intern ("mouse-5"), |
aa6be081315b
(Vmouse_events): Rename from Vmenu_events.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
52740
diff
changeset
|
3827 Qnil))))))))); |
50141
3770fda038d0
(Vmenu_events): New var.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49912
diff
changeset
|
3828 |
3770fda038d0
(Vmenu_events): New var.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49912
diff
changeset
|
3829 |
250 | 3830 Qsingle_key_description = intern ("single-key-description"); |
3831 staticpro (&Qsingle_key_description); | |
3832 | |
3833 Qkey_description = intern ("key-description"); | |
3834 staticpro (&Qkey_description); | |
3835 | |
3836 Qkeymapp = intern ("keymapp"); | |
3837 staticpro (&Qkeymapp); | |
3838 | |
2727
b8911c8b9700
* keymap.c (Fwhere_is_internal): If FIRSTONLY is non-nil, avoid
Jim Blandy <jimb@redhat.com>
parents:
2652
diff
changeset
|
3839 Qnon_ascii = intern ("non-ascii"); |
b8911c8b9700
* keymap.c (Fwhere_is_internal): If FIRSTONLY is non-nil, avoid
Jim Blandy <jimb@redhat.com>
parents:
2652
diff
changeset
|
3840 staticpro (&Qnon_ascii); |
b8911c8b9700
* keymap.c (Fwhere_is_internal): If FIRSTONLY is non-nil, avoid
Jim Blandy <jimb@redhat.com>
parents:
2652
diff
changeset
|
3841 |
21241
31bd04a792c2
(fix_submap_inheritance, get_keyelt, store_in_keymap,
Richard M. Stallman <rms@gnu.org>
parents:
20883
diff
changeset
|
3842 Qmenu_item = intern ("menu-item"); |
31bd04a792c2
(fix_submap_inheritance, get_keyelt, store_in_keymap,
Richard M. Stallman <rms@gnu.org>
parents:
20883
diff
changeset
|
3843 staticpro (&Qmenu_item); |
31bd04a792c2
(fix_submap_inheritance, get_keyelt, store_in_keymap,
Richard M. Stallman <rms@gnu.org>
parents:
20883
diff
changeset
|
3844 |
43494
b5b76b498398
The following changes rework my patch of 2002-02-06 which
Kim F. Storm <storm@cua.dk>
parents:
43164
diff
changeset
|
3845 Qremap = intern ("remap"); |
b5b76b498398
The following changes rework my patch of 2002-02-06 which
Kim F. Storm <storm@cua.dk>
parents:
43164
diff
changeset
|
3846 staticpro (&Qremap); |
b5b76b498398
The following changes rework my patch of 2002-02-06 which
Kim F. Storm <storm@cua.dk>
parents:
43164
diff
changeset
|
3847 |
49757
9fe119b14379
Renamed remap-command to command-remapping. All uses changed.
Kim F. Storm <storm@cua.dk>
parents:
49720
diff
changeset
|
3848 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
|
3849 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
|
3850 |
32889
673e3ef1f7f6
(where_is_cache, where_is_cache_keymaps): New vars.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
32846
diff
changeset
|
3851 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
|
3852 where_is_cache = Qnil; |
673e3ef1f7f6
(where_is_cache, where_is_cache_keymaps): New vars.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
32846
diff
changeset
|
3853 staticpro (&where_is_cache); |
673e3ef1f7f6
(where_is_cache, where_is_cache_keymaps): New vars.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
32846
diff
changeset
|
3854 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
|
3855 |
250 | 3856 defsubr (&Skeymapp); |
15344
82615c826910
(Fkeymap_parent, Fset_keymap_parent): New functions.
Richard M. Stallman <rms@gnu.org>
parents:
14738
diff
changeset
|
3857 defsubr (&Skeymap_parent); |
39689
0572449a62be
(Fkeymap_prompt, Fcurrent_active_maps): New funs.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
39682
diff
changeset
|
3858 defsubr (&Skeymap_prompt); |
15344
82615c826910
(Fkeymap_parent, Fset_keymap_parent): New functions.
Richard M. Stallman <rms@gnu.org>
parents:
14738
diff
changeset
|
3859 defsubr (&Sset_keymap_parent); |
250 | 3860 defsubr (&Smake_keymap); |
3861 defsubr (&Smake_sparse_keymap); | |
50798
2d72cdb7e9f8
(map_keymap_item, map_keymap_char_table_item, map_keymap)
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
50190
diff
changeset
|
3862 defsubr (&Smap_keymap); |
250 | 3863 defsubr (&Scopy_keymap); |
49757
9fe119b14379
Renamed remap-command to command-remapping. All uses changed.
Kim F. Storm <storm@cua.dk>
parents:
49720
diff
changeset
|
3864 defsubr (&Scommand_remapping); |
250 | 3865 defsubr (&Skey_binding); |
3866 defsubr (&Slocal_key_binding); | |
3867 defsubr (&Sglobal_key_binding); | |
465 | 3868 defsubr (&Sminor_mode_key_binding); |
250 | 3869 defsubr (&Sdefine_key); |
3870 defsubr (&Slookup_key); | |
3871 defsubr (&Sdefine_prefix_command); | |
3872 defsubr (&Suse_global_map); | |
3873 defsubr (&Suse_local_map); | |
3874 defsubr (&Scurrent_local_map); | |
3875 defsubr (&Scurrent_global_map); | |
465 | 3876 defsubr (&Scurrent_minor_mode_maps); |
39689
0572449a62be
(Fkeymap_prompt, Fcurrent_active_maps): New funs.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
39682
diff
changeset
|
3877 defsubr (&Scurrent_active_maps); |
250 | 3878 defsubr (&Saccessible_keymaps); |
3879 defsubr (&Skey_description); | |
3880 defsubr (&Sdescribe_vector); | |
3881 defsubr (&Ssingle_key_description); | |
3882 defsubr (&Stext_char_description); | |
3883 defsubr (&Swhere_is_internal); | |
39689
0572449a62be
(Fkeymap_prompt, Fcurrent_active_maps): New funs.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
39682
diff
changeset
|
3884 defsubr (&Sdescribe_buffer_bindings); |
250 | 3885 defsubr (&Sapropos_internal); |
3886 } | |
3887 | |
21514 | 3888 void |
250 | 3889 keys_of_keymap () |
3890 { | |
3891 initial_define_key (global_map, 033, "ESC-prefix"); | |
3892 initial_define_key (global_map, Ctl('X'), "Control-X-prefix"); | |
3893 } | |
52401 | 3894 |
3895 /* arch-tag: 6dd15c26-7cf1-41c4-b904-f42f7ddda463 | |
3896 (do not change this comment) */ |