1
Fork 0
mirror of git://git.sv.gnu.org/emacs.git synced 2026-02-06 07:31:13 -08:00
Commit graph

66 commits

Author SHA1 Message Date
Karl Heuer
9fc722dee1 (Fwhere_is_internal): Skip duplicates. 1994-03-25 03:02:27 +00:00
Karl Heuer
e9b6dfb0d1 (access_keymap, store_in_keymap, Fcopy_keymap, Fdefine_key,
Faccessible_keymaps, Fwhere_is_internal): Use assignment instead of
initialization.
1994-03-23 22:50:23 +00:00
Richard M. Stallman
c25f25a218 (where_is_string, Fwhere_is): Deleted.
(syms_of_keymap): Corresponding changes.
1994-03-23 04:51:55 +00:00
Karl Heuer
5907b8633f (Fdefine_key): Check for non-events in keyvector. 1994-03-22 23:36:28 +00:00
Karl Heuer
90f80bcf8a (Fkeymapp): Doc fix. 1994-03-21 22:53:17 +00:00
Karl Heuer
d65a13c594 (Fcopy_keymap): Account for menus and equiv-key cache. 1994-03-21 22:48:13 +00:00
Richard M. Stallman
c6ec9f6e89 (get_keyelt): Cached equiv-key data is now a sublist. 1994-02-21 21:50:02 +00:00
Richard M. Stallman
ffab2bd62c (get_keyelt): Discard keyboard equivalents
stored in a menu keymap element.
1994-02-19 06:29:30 +00:00
Richard M. Stallman
f0148b5e8a (Fwhere_is_internal): Take just one keymap arg.
(where_is_string): Pass Voverriding_local_map for that arg.
1994-02-04 23:11:34 +00:00
Richard M. Stallman
64116ad5e7 Whitespace changes. 1994-01-30 01:09:58 +00:00
Karl Heuer
e58077c893 Scale by sizeof when allocating objects. 1994-01-29 02:09:41 +00:00
Richard M. Stallman
7d92e3291a (Fkey_binding): Handle Voverriding_local_map.
(describe_buffer_bindings): Likewise.
1994-01-16 23:39:50 +00:00
Richard M. Stallman
af1d6f09ce (describe_map_tree): New arg NOMENU.
(describe_buffer_bindings): Pass new arg.
1994-01-10 21:30:25 +00:00
Richard M. Stallman
24065b9c3d (describe_command): If binding is a kbd macro, say so. 1993-12-29 07:43:21 +00:00
Richard M. Stallman
b8d584f66f (Fwhere_is_internal): Doc fix. 1993-12-23 01:54:13 +00:00
Richard M. Stallman
c818754bc1 Doc fix. 1993-11-21 22:43:09 +00:00
Richard M. Stallman
d831234ba2 (Fkey_binding): Doc fix. 1993-11-17 11:25:53 +00:00
Roland McGrath
18160b98ce Include <config.h> instead of "config.h". 1993-09-10 06:15:46 +00:00
Richard M. Stallman
a588e041b4 (describe_buffer_bindings): Declare shadow just once. 1993-08-11 21:10:44 +00:00
Jim Blandy
718ca51e40 * keyboard.c (read_key_sequence): Accept both strings and vectors
as bindings in function-key-map.
    	* keymap.c (Vfunction_key_map in syms_of_keymap): Doc fix.

	* keymap.c (syms_of_keymap): Doc fix.
1993-07-18 06:25:40 +00:00
Richard M. Stallman
07f15dfd8b (describe_map_tree): When inserting TITLE, mention PREFIX.
Insert newline at end, if inserted anything else.
(describe_buffer_bindings): Corresponding changes.
For minor mode maps, build up a title string,
then let describe_map_tree insert it.
1993-07-07 18:40:35 +00:00
Richard M. Stallman
f66ef18523 (Faccessible_keymaps): Doc fix. 1993-07-03 03:58:10 +00:00
Richard M. Stallman
53c8f9fa14 (describe_map_tree): Insert key_heading here.
New arg TITLE.
(describe_buffer_bindings): Corresponding changes.

(shadow_lookup): New function.
(describe_map_2): Call it.  SHADOW is now a list of maps.
(describe_vector): Likewise.
(describe_map): SHADOW is now a list of maps.
(describe_map_tree): Likewise.
(describe_buffer_bindings): Build suitable list to pass as SHADOW.
(Faccessible_keymaps): New arg PREFIX.  Callers changed.
(describe_map_tree): New arg PREFIX.
(Fdescribe_bindings): New arg PREFIX.
Pass to describe_buffer_bindings along with buffer.
(describe_buffer_bindings): Extract PREFIX and pass along.
1993-07-02 05:21:05 +00:00
Richard M. Stallman
99a225a911 (describe_map_2): Cleanups.
Check there's no previous definition in same keymap.
1993-06-28 19:20:28 +00:00
Richard M. Stallman
c07aec9773 Make prefix keys work with keymap inheritance
by creating an inheritance structure for each subkeymap
that we create in the inheriting keymap.

(access_keymap): New arg NOINHERIT.  All calls changed.
(define_as_prefix): New function.
(Fdefine_key): Use them.
1993-06-15 06:26:00 +00:00
Richard M. Stallman
81fa9e2f86 (get_keymap_1): Add missing semicolon.
(describe_vector_princ): Align to column 16.
1993-06-12 17:17:05 +00:00
Richard M. Stallman
98006242df (Fcopy_keymap): Check Fkeymapp value with NILP. 1993-06-12 07:19:39 +00:00
Richard M. Stallman
ad4ec84a08 (Fdescribe_vector): Use current buf, not standard-output.
(describe_vector_princ): Add newline at end.

(store_in_keymap, access_keymap): Use CHAR_META
when clearing excess high bits.
1993-06-11 04:16:13 +00:00
Richard M. Stallman
2fa8c0b5d4 Doc fix. 1993-06-07 17:19:36 +00:00
Richard M. Stallman
2732bdbbbf (access_keymap, store_in_keymap): Discard meaningless
high bits of a character event.
1993-06-06 06:45:22 +00:00
Richard M. Stallman
1447c534b5 (syms_of_keymap): Add missing 2nd arg to Fcons. 1993-06-02 02:09:04 +00:00
Richard M. Stallman
19eaeb8609 (syms_of_keymap): Create global_map 256 slots long. 1993-05-28 22:31:52 +00:00
Jim Blandy
c6c5df7f76 Updated copyright years. 1993-05-22 21:34:42 +00:00
Jim Blandy
3d24868836 Doc fix. 1993-05-19 04:27:16 +00:00
Richard M. Stallman
926a64aa20 (access_keymap): Handle any length vector.
(store_in_keymap): Likewise.
(Fcopy_keymap): Likewise.
1993-05-14 22:11:17 +00:00
Richard M. Stallman
992984b287 (current_minor_maps): Call Findirect_function, so symbols
can be used in place of actual maps.
1993-05-13 00:20:51 +00:00
Richard M. Stallman
db6f9d952e (Faccessible_keymaps): Use whatever size the vector has.
(Fwhere_is_internal): Likewise.
(describe_vector): Likewise.
1993-05-12 21:58:16 +00:00
Jim Blandy
2fc6697323 * keymap.c (Fwhere_is_internal): If FIRSTONLY is non-nil, avoid
returning a non-ascii key sequence unless FIRSTONLY is the symbol
	`non-ascii'.
1993-05-10 00:17:31 +00:00
Jim Blandy
cd8520b9d5 * keymap.c (Fdefine_prefix_command): Doc fix. 1993-05-04 02:33:19 +00:00
Jim Blandy
9ac0d9e041 Put interrupt input blocking in a separate file from xterm.h.
This isn't specific to X, and it allows us to avoid #including
	xterm.h in files that don't really have anything to do with X.
	* blockinput.h: New file.
	* xterm.h (BLOCK_INPUT, UNBLOCK_INPUT, TOTALLY_UNBLOCK_INPUT,
	UNBLOCK_INPUT_RESIGNAL): These are now in blockinput.h.
	(x_input_blocked, x_pending_input): Deleted; there are analogs
	in blockinput.h called interrupt_input_blocked and
	interrupt_input_pending.
	* keyboard.c (interrupt_input_blocked, interrupt_input_pending):
	New variables, used by the macros in blockinput.h.
	* xterm.c: #include blockinput.h.
	(x_input_blocked, x_pending_input): Deleted.
	(XTread_socket): Test and set interrupt_input_blocked and
	interrupt_input_pending instead of the old variables.
	* alloc.c, xfaces.c, xfns.c, xmenu.c, xselect.c, keymap.c:
	#include blockinput.h.
	* eval.c: #include blockinput.h instead of xterm.h.
	* keyboard.c: #include blockinput.h.
	(input_poll_signal): Just test
	interrupt_input_blocked, instead of testing HAVE_X_WINDOWS and
	x_input_blocked.

	Block the processing of interrupt input while we're manipulating the
	malloc heap.
	* alloc.c: (xfree): New function, to make it easy to free things
	safely.
	(xmalloc, xrealloc): Block X input while doing the deed.
	(VALIDATE_LISP_STORAGE, gc_sweep, compact_strings): Use xfree
	instead of free.
	(uninterrupt_malloc): New function, to install input-blocking
	hooks into the GNU malloc routines.
	* emacs.c [not SYSTEM_MALLOC] (main): Call uninterrupt_malloc
	on startup.
	* alloc.c: (make_interval, make_float, Fcons, Fmake_vector,
	Fmake_symbol, Fmake_marker, make_uninit_string, Fgarbage_collect):
	Use xmalloc instead of malloc; don't bother to check if out of
	memory here.
	(Fgarbage_collect): Call xrealloc instead of realloc.
	* buffer.c: Use xmalloc and xfree instead of malloc and free;
	don't bother to check if out of memory here.
	(Fget_buffer_create): Put BLOCK_INPUT/UNBLOCK_INPUT pair around
	calls to ralloc routines.
	* insdel.c: Same.
	* lisp.h (xfree): New extern declaration.
	* xfaces.c (xfree): Don't #define this to be free; use the
	definition in alloc.c.
	* dispnew.c, doc.c, doprnt.c, fileio.c, lread.c, term.c, xfns.c,
	xmenu.c, xterm.c: Use xfree instead of free.
	* hftctl.c: Use xfree and xmalloc instead of free and malloc.
	* keymap.c (current_minor_maps): BLOCK_INPUT while calling realloc
	and malloc.
	* search.c: Since the regexp routines can malloc, BLOCK_INPUT
	while runing them.  #include blockinput.h.
	* sysdep.c: #include blockinput.h.  Call xfree and xmalloc instead
	of free and malloc.  BLOCK_INPUT around routines which we know
	will call malloc.

	ymakefile (keyboard.o, keymap.o, search.o, sysdep.o, xfaces.o,
	xfns.o, xmenu.o, xterm.o, xselect.o, alloc.o, eval.o): Note that
	these depend on blockinput.h.
1993-03-31 10:55:33 +00:00
Jim Blandy
35014b9f53 * keymap.c (Fkeymapp): Doc fix. 1993-03-25 02:45:35 +00:00
Richard M. Stallman
71ac885b6f (push_key_description): Ignore bits above meta_modifier. 1993-03-24 10:05:49 +00:00
Richard M. Stallman
0b8fc2d451 (Fdefine_key): Use proper meta-bit to clear.
(access_keymap): Handle ints beyond the ASCII range.
(store_in_keymap): Likewise.
(Faccessible_keymaps): Use meta_modifier.
Use vectors for the key sequences.
(Fwhere_is_internal): Use meta_modifier.
(append_key): Always return a vector.
1993-03-10 05:24:42 +00:00
Richard M. Stallman
6ba6e250c9 Include termhooks.h.
(push_key_description): Handle all modifiers.
Handle large character codes.
(Fkey_description): Move the meta bit, if arg is string.
(Fsingle_key_description): Don't alter integer value.
Make tem long enough.

(Flookup_key): Use meta_modifier as meta-bit if from vector.
(Fdefine_key): Likewise.
1993-03-07 23:32:54 +00:00
Jim Blandy
92cc37e8ce * keymap.c (Fdescribe_vector): Pass the proper number of arguments
to describe_vector.
	* syntax.c (describe_syntax_1): Same.
1993-02-22 14:44:52 +00:00
Richard M. Stallman
5cba3869f5 (describe_map): Call Fkey_description before build_string. 1993-02-19 05:43:54 +00:00
Jim Blandy
7c1402521d * keymap.c (Flookup_key, Fkey_binding, Flocal_key_binding,
Fglobal_key_binding, Fminor_mode_key_binding): Add a new optional
	argument ACCEPT_DEFAULT, to control whether this function sees
	bindings for t.
	(Fwhere_is_internal, describe_map_tree, describe_map_2,
	describe_vector): Pass the proper arguments to Flookup_key.
1993-02-14 14:38:43 +00:00
Jim Blandy
dbc4e1c129 JimB's changes since January 18th 1993-01-26 01:58:16 +00:00
Jim Blandy
8e4dfd5403 * keymap.c (get_keymap_1): Don't try to autoload OBJECT's function
unless the autoload form indicates that it's a keymap.
1992-11-07 07:34:58 +00:00
Jim Blandy
d09b20248d * keymap.c (Fdefine_key, Flookup_key, describe_map): Don't assume
that Flength returns an integer.

	* keymap.c: Deal with autoloaded keymaps properly.
        (get_keymap_1): Renamed to inner_get_keymap; made
	static.  New argument AUTOLOAD says to pursue autoloads if
	non-zero.
	(Fkeymapp, get_keymap, get_keyelt, Flookup_key): Ask get_keymap_1
	not to perform autoloads.
	(Fdefine_key): Ask get_keymap_1 to perform autoloads.  Since
	autoloading may GC, remember that we have to GCPRO our local
	variables now.
	(Fminor_mode_key_binding): Call get_keymap instead of calling
	get_keymap_1 with equivalent arguments.
1992-10-31 05:24:47 +00:00