1
Fork 0
mirror of git://git.sv.gnu.org/emacs.git synced 2026-02-05 07:01:11 -08:00
Commit graph

289 commits

Author SHA1 Message Date
Karoly Lorentey
f2e45864d1 Merged in changes from CVS trunk.
Patches applied:

 * miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-220
   Update from CVS

 * miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-221
   Restore deleted tagline in etc/TUTORIAL.ru

 * miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-222
   Update from CVS

 * miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-223
   Update from CVS

 * miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-224
   Update from CVS

 * miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-225
   Update from CVS


git-archimport-id: lorentey@elte.hu--2004/emacs--multi-tty--0--patch-144
2004-04-18 01:40:02 +00:00
Kim F. Storm
f8d8ba4051 (Fkey_description): Add optional PREFIX arg.
Combine prefix with KEYS to make up the full key sequence to describe.
Correlate meta_prefix_char and following (simple) key to describe
as meta modifier.  All callers changed.
(describe_map): Rename arg `keys' to `prefix'.  Remove local
`elt_prefix' var.  Use Fkey_description with prefix instead of
elt_prefix combined with Fsingle_key_description.
(describe_vector): Declare static.  Replace arg `elt_prefix' with
`prefix'.  Add KEYMAP_P arg.  Add local var `elt_prefix'; use it
if !KEYMAP_P. Use Fkey_description with prefix instead of
Fsingle_key_description.
2004-04-16 21:16:33 +00:00
Karoly Lorentey
e581a46687 Merged in changes from CVS HEAD
Patches applied:

 * miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-71
   Update from CVS

 * miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-72
   Update from CVS

 * miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-73
   Update from CVS

 * miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-74
   Update from CVS

 * miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-75
   Update from CVS

 * miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-76
   Update from CVS

 * miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-77
   Update from CVS

 * miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-78
   Update from CVS

 * miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-79
   Update from CVS

 * miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-80
   Update from CVS

 * miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-81
   Update from CVS

 * miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-82
   Update from CVS

 * miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-83
   Update from CVS

 * miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-84
   Add lisp/emacs-lisp/macroexp.el

 * miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-85
   Update from CVS

 * miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-86
   Update from CVS

 * miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-87
   Update from CVS

 * miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-88
   Update from CVS

 * miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-89
   Update from CVS

 * miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-90
   Update from CVS

 * miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-91
   Update from CVS

 * miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-92
   Update from CVS

 * miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-93
   Update from CVS

 * miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-94
   Update from CVS

 * miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-95
   Update from CVS

 * miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-96
   Update from CVS

 * miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-97
   Update from CVS


git-archimport-id: lorentey@elte.hu--2004/emacs--multi-tty--0--patch-77
2004-02-17 01:52:25 +00:00
Stefan Monnier
9d209cfe20 (Vmouse_events): Rename from Vmenu_events.
(syms_of_keymap): Add mouse-[45], header-line, and mode-line to it.
2004-02-04 20:19:37 +00:00
Karoly Lorentey
428a555ec5 Converted display hooks to be display-local. Plus many bugfixes.
lib-src/emacsclient.c (window_change_signal): Renamed to pass_signal_to_emacs.
(init_signal): Pass SIGINT and SIGQUIT to the emacs process.

lisp/faces.el (face-valid-attribute-values): Use the window-system
function, not the variable.
(read-face-attribute, face-spec-set-match-display, frame-set-background-mode)
(face-set-after-frame-default): Ditto.

lisp/frame.el (make-frame-on-tty): Added interactive declaration
(suggested by Robert J. Chassell).  Use tty-create-frame-with-faces,
not make-terminal-frame.

src/termhooks.h (struct display_method): Renamed to display for brevity.
(struct display): Added all display hook variables as members of this structure.
Added next_display, reference_count, type and display_info components.
(FRAME_MUST_WRITE_SPACES, FRAME_FAST_CLEAR_END_OF_LINE, FRAME_LINE_INS_DEL_OK)
(FRAME_CHAR_INS_DEL_OK, FRAME_SCROLL_REGION_OK, FRAME_SCROLL_REGION_COST)
(FRAME_MEMORY_BELOW_FRAME, FRAME_RIF): Updated for struct display.
(FRAME_DISPLAY): New macro.
(create_display, delete_display): New prototypes.

src/frame.h (struct frame): Added `display' member, removed display_method.
(FRAME_LIVE_P): Look at f->display, not f->output_data.

src/termchar.h (struct tty_display_info): Removed display_method component.
(FRAME_TTY): Use the display structure, not output_data.

src/term.c (display_list): New variable.
(cursor_to_hook, raw_cursor_to_hook, clear_to_end_hook, clear_frame_hook)
(clear_end_of_line_hook, ins_del_lines_hook, delete_glyphs_hook)
(ring_bell_hook, reset_terminal_modes_hook, set_terminal_modes_hook)
(update_begin_hook, update_end_hook, set_terminal_window_hook)
(insert_glyphs_hook, write_glyphs_hook, delete_glyphs_hoo, read_socket_hook)
(frame_up_to_date_hook, mouse_position_hook, frame_rehighlight_hook)
(frame_raise_lower_hook, set_vertical_scroll_bar_hook, condemn_scroll_bars_hook)
(redeem_scroll_bar_hook, judge_scroll_bars_hook): Moved to struct display.
(tty_display_method_template): Removed.
(syms_of_term): Don't initialize tty_display_method_template.
(ring_bell, set_terminal_modes, reset_terminal_modes, update_begin)
(update_end, set_terminal_window, cursor_to, raw_cursor_to, clear_to_end)
(clear_frame, clear_end_of_line, write_glyphs, insert_glyphs)
(delete_glyphs, ins_del_lines): Access display hooks through the frame pointer.
(Ftty_display_color_p): Use the frame given as a parameter, or else return nil.
(Ftty_display_color_cells): Ditto.
(get_named_tty): Renamed to get_named_tty_display, changed return type to struct display.
(term_dummy_init): Renamed to initial_term_init.  Create and return an initial display.
(term_init): Initialize a new struct display and return a pointer to
it instead of tty_display_info.  Removed frame initialization kludge.
(Fdelete_tty): Updated for struct display.
(delete_tty): The parameter type is now struct display, not tty_display_info.
Delete the display, too.
(create_tty_output): New function for creating tty_output structures.
(delete_tty_output): New function for deleting tty_output structures.
(create_display): New function for creating and registering display structures.
(delete_display): New function for deleting and unregistering display structures.

src/dispextern.h: Updated prototypes.

src/dispnew.c:  Include frame.h before termhooks.h.
(init_display): Updated term_init call to new signature.

src/emacs.c: Include frame.h (for termhooks.h).
src/keymap.c: Ditto.
src/lread.c: Ditto.
src/xsmfns.c: Ditto.

src/process.c: Include frame.h before termhooks.h.

src/frame.c (Fwindow_system): New function.
(syms_of_frame): Initialize it.
(make_terminal_frame): Open the terminal device before creating the new frame.
Disable scrollbars here, term_init cannot do that anymore.
(Fdelete_frame): Use the new delete_frame_hook, don't do display-specific
frame deletion here.  Ditto for delete_display_hook.
(Fmouse_position, Fmouse_pixel_position, Fraise_frame, Flower_frame)
(Fredirect_frame_focus): Access display hooks through the frame pointer.

src/keyboard.c: Include frame.h before termhooks.h.
(start_polling, input_polling_used, stop_polling, gobble_input): Ignore read_socket_hook.
(kbd_buffer_get_event, Fset_input_mode): Access display hooks through the frame pointer.
(read_avail_input): Loop through all display devices for and call all read_socket_hook functions.  Check ttys even if read_socket_hook returned an error.

src/sysdep.c (discard_tty_input): Ignore read_socket_hook.
(stuff_char): Don't do anything if the current frame is not on a termcap display.
(request_sigio, unrequest_sigio): Ignore read_socket_hook.
(init_sys_modes): Always call narrow_foreground_group.  Set up terminal modes and sigio even under X.

src/xdisp.c (message2_nolog, message3_nolog, redisplay_internal)
(set_vertical_scroll_bar, redisplay_window): Access display hooks through the frame pointer.
(echo_area_display): Don't be afraid of termcap frames during an X+tty combo session.

src/xfaces.c: Include termhooks.h.
(Ftty_supports_face_attributes_p): Use the given frame, not selected_frame.

src/xfns.c (x_set_scroll_bar_foreground, x_set_scroll_bar_background): Access display hooks through the frame pointer.
(Fx_create_frame, x_create_tip_frame): Initialize the frame's display structure.
src/xmenu.c: Include termhooks.h after frame.h.

src/xselect.c (x_own_selection, some_frame_on_display, x_get_foreign_selection)
(Fx_disown_selection_internal, Fx_get_cut_buffer_internal)
(Fx_store_cut_buffer_internal, Fx_rotate_cut_buffers_internal): Don't do anything
if the selected frame is not an X frame.

src/xterm.c (x_display_method): Removed.
(x_create_frame_display, x_delete_frame_display): New functions for handling struct display objects.
(x_term_init): Set up a new struct display object, too.
(x_delete_display): Delete the struct display corresponding to the X display.
(x_initialize): Moved hook initialization to x_create_frame_display.

src/xterm.h (x_display_method): Removed.
(struct x_display_info): Added frame_display component.


git-archimport-id: lorentey@elte.hu--2004/emacs--multi-tty--0--patch-44
2004-01-05 05:54:35 +00:00
John Paul Wallington
26a6e439a3 (map_keymap): Don't abort when binding is a vector. 2003-10-03 08:30:55 +00:00
Miles Bader
ab5796a9f9 Add arch taglines 2003-09-01 15:45:59 +00:00
Richard M. Stallman
fe72189a11 (Fset_keymap_parent, map_keymap, Fcopy_keymap)
(Faccessible_keymaps): Pass new arg to map_char_table.
2003-05-17 12:47:55 +00:00
Stefan Monnier
edf505ce9a (map_keymap): Doc fix. 2003-05-05 18:06:03 +00:00
Stefan Monnier
9d3153eb87 (map_keymap_item, map_keymap_char_table_item, map_keymap)
(map_keymap_call, Fmap_keymap): New functions.
(syms_of_keymap): Defsubr map-keymap.
2003-05-04 00:13:06 +00:00
Stefan Monnier
fad865a362 (Faccessible_keymaps): Remove unused var. 2003-03-18 19:35:23 +00:00
Stefan Monnier
73a4675c84 (accessible_keymaps_1): Break cycles but without preventing
multiple occurrences of the same keymap under different prefixes.
(Faccessible_keymaps): Remove code redundant since 1994-08-03T07:39:00Z!rms@gnu.org.
2003-03-18 19:34:31 +00:00
Stefan Monnier
d378869e04 (Vmenu_events): New var.
(syms_of_keymap): Initialize it.
(where_is_internal): Check more carefully what is a menu event.
2003-03-16 00:06:59 +00:00
Stefan Monnier
80951487d7 (copy_keymap_1): Make it static. 2003-02-22 22:18:42 +00:00
Kai Großjohann
2d772f45c1 (Fdefine_key): Clarification of formulation. 2003-02-21 16:38:34 +00:00
Kai Großjohann
3abeca61dc (Fdefine_key): Doc fix. 2003-02-21 16:34:59 +00:00
Kai Großjohann
6423934163 Typo in docstring for define-key. 2003-02-19 16:27:21 +00:00
Kim F. Storm
023b93f6b0 Renamed remap-command to command-remapping. All uses changed. 2003-02-12 23:13:43 +00:00
Kim F. Storm
078d0f3888 (Fremap_command): Return nil if arg is not a symbol. 2003-02-11 14:35:24 +00:00
Richard M. Stallman
5d55ffd05d (apropos_predicate, apropos_accumulate): Make them static.
(syms_of_keymap): staticpro them.
(Fapropos_internal): Initialize them and clear them out.
Don't GCPRO them.
2003-01-06 00:53:47 +00:00
Ken Raeburn
3141e0abe1 (Fdescribe_buffer_bindings): Use const for pointer to
lisp string data.
2002-07-16 19:48:37 +00:00
Ken Raeburn
d5db40779d Most uses of XSTRING combined with STRING_BYTES or indirection changed to
SCHARS, SBYTES, STRING_INTERVALS, SREF, SDATA; explicit size_byte references
left unchanged for now.
2002-07-15 00:01:34 +00:00
Markus Rost
35936c5c67 (Fkey_binding): Fix typo. 2002-07-12 03:38:12 +00:00
Juanma Barranquero
aed1337830 Use macro SPECPDL_INDEX. 2002-07-11 14:18:02 +00:00
Richard M. Stallman
bbc4541dcf (Fdefine_key): Doc fix. 2002-07-02 19:13:12 +00:00
Juanma Barranquero
95296eacc6 (syms_of_keymap): Fix typo. 2002-07-02 15:27:56 +00:00
Thien-Thi Nguyen
744cd66b79 (describe_command): Cast `current_column' return value to int. 2002-06-03 01:39:27 +00:00
Ken Raeburn
c85d524cf7 * keymap.c (silly_event_symbol_error, Fsingle_key_description)
(Fdescribe_buffer_bindings): Use SYMBOL_NAME and XSTRING instead
of XSYMBOL and name field.
(describe_command, describe_translation): Use SYMBOL_NAME and
assignment instead of XSYMBOL and name field and XSETSTRING.
2002-05-20 08:06:00 +00:00
Stefan Monnier
31bea176a6 (keymap_parent): New fun, extracted from Fkeymap_parent.
(Fkeymap_parent, keymap_memberp, fix_submap_inheritance): Use it.
(Fset_keymap_parent): Gcpro a bit more.
(access_keymap): Gcpro around meta_map call and around the main loop.
(get_keyelt): Gcpro when following indirect references.
(copy_keymap_item): New fun, extracted from Fcopy_keymap.
(copy_keymap_1, Fcopy_keymap): Use it.  Don't copy the parent map.
(Fdefine_key, Flookup_key): Gcpro before calling get_keymap.
Remove useless ad-hoc remap code.
2002-05-14 03:04:31 +00:00
Kim F. Storm
cd6db61a7a (current_minor_maps): Fixed resizing of cmm_maps;
only update cmm_size if realloc actually succeeds.
Testing with initial size of 2 elements revealed that using
realloc on GNU/Linux would cause a random trap in xmalloc
later on, so I rewrote the code to use malloc/bcopy/free instead
of realloc.
2002-05-10 23:57:14 +00:00
Kim F. Storm
99cbcacac3 (Vemulation_mode_map_alists): New variable.
(syms_of_keymap): DEFVAR_LISP it.
(current_minor_maps): Process keymap alists in that list before
minor-mode-overriding-map-alist and minor-mode-map-alist.
2002-05-10 07:03:20 +00:00
Kim F. Storm
5f24537118 (Flookup_key): Fixed problem in 2001-12-28 patch:
The validation of the event type was too strict as it didn't
allow string events; buffer names are used in bindings for
menu-bar-select-buffer (see `menu-bar-update-buffers').
2002-02-24 00:24:37 +00:00
Kim F. Storm
a1df473f03 The following changes rework my patch of 2002-02-06 which
added command remapping by entering the commands directly into
the keymaps.  Now, command remapping uses an explicit `remap'
prefix in the keymaps, i.e. [remap COMMAND].

(Qremap, remap_command_vector): New variables.
(is_command_symbol): Removed function.
(Fdefine_key): No longer accept a symbol for KEY.  Added
validation of [remap COMMAND] argument for KEY.  The DEF is no
longer required to be a symbol when remapping a command.
(Fremap_command): New function to remap command through keymaps.
(Flookup_key): Perform command remapping initiated by
Fremap_command directly for speed.
(Fkey_binding): Use Fremap_command for command remapping.
(where_is_internal): Handle new command remapping representation.
(syms_of_keymap): Intern Qremap, initialize remap_command_vector,
staticpro them.  Defsubr Fremap_command.
2002-02-23 22:00:37 +00:00
Kim F. Storm
b864457cf8 (where_is_internal): Only check if definition is
remapped if it fulfills is_command_symbol.
2002-02-07 11:12:50 +00:00
Kim F. Storm
0c412762ee (Fdefine_key): Allow symbol as KEY argument for
defining command remapping.  Doc updated.
(Flookup_key): Remap command through keymap if KEY is a symbol.
(is_command_symbol): New function.
(Fkey_binding): Use it.  New optional argument NO-REMAP.  Doc
updated.  Callers changed.  Perform command remapping via
recursive call unless that arg is non-nil.
(where_is_internal): New argument no_remap.  Callers changed.
Call recursively to find original key bindings for a remapped
comand unless that arg is non-nil.
(Fwhere_is_internal): New optional argument NO-REMAP.  Doc
updated.  Callers changed.  Pass arg to where_is_internal.
2002-02-06 22:57:42 +00:00
Richard M. Stallman
d1d070e3c5 (Fcurrent_active_maps): Put the `keymap' property map first.
(Fkey_binding): Try the `keymap' property map first.
(Fdescribe_buffer_bindings): Show `keymap' property bindings before
minor mode bindings.
2002-01-03 21:28:16 +00:00
Richard M. Stallman
15fff01d49 (silly_event_symbol_error): New subrtn, from Fdefine_key.
Handle modifier bits.  Correct typo in error message.
2001-12-29 14:54:28 +00:00
Richard M. Stallman
ade19cac43 Fix previous change; also correct its change log:
(Fdefine_key): Add error message for trying to bind [DEL], [RET], etc.
(exclude_keys): New variable.
(Flookup_key): Error message if key has wrong data type.
2001-12-28 18:49:02 +00:00
Richard M. Stallman
2fae9111a4 (Flookup_key): Add error message for trying to bind [DEL], [RET], etc. 2001-12-28 18:39:20 +00:00
Pavel Janík
f0529b5b1a Doc fix. 2001-12-20 19:01:00 +00:00
Stefan Monnier
4dc3eb25ae (access_keymap): Handle t bindings like nil bindings.
Make nil bindings in char-tables transparent.
(store_in_keymap): Turn a nil binding into a t binding for char-tables.
2001-11-26 22:30:21 +00:00
Pavel Janík
1b944d9cd9 (access_keymap): Remove unused variables c1' and c2'. 2001-11-23 07:04:49 +00:00
Stefan Monnier
d55627cca4 (Fdescribe_vector): Add `describer' parameter.
(describe_command, describe_translation): Add dummy second param.
(describe_map): Call elt_describer with two arguments.
(describe_vector_princ): Add `fun' parameter.
Call it instead of the hardcoded `princ'.
(describe_vector): Add arg `args'.
Pass it as a new second argument to elt_describer.
2001-11-19 22:46:37 +00:00
Pavel Janík
335c5470b5 Change doc-string comments to new style' [w/doc:' keyword]. 2001-11-13 07:48:37 +00:00
Pavel Janík
830ddd7780 (access_keymap): Fix compilation error. 2001-11-07 08:47:21 +00:00
Richard M. Stallman
efb916453f (access_keymap): Don't use initializers on Lisp_Object. 2001-11-07 03:35:05 +00:00
Pavel Janík
b782650360 Update usage of CHECK_ macros (remove unused second argument). 2001-11-02 20:46:55 +00:00
Richard M. Stallman
36ca6189c6 (Fdescribe_buffer_bindings): Print character property
bindings along with or instead of the buffer local map.
Make the overriding maps override what they should.
2001-11-01 19:55:42 +00:00
Pavel Janík
13b1a09c3e (access_keymap): Remove unused variable `charset'. 2001-10-28 10:53:43 +00:00
Stefan Monnier
ef879104ac (current_minor_maps): `override' only shadows its
correspondent in minor-mode-map-alist, not the whole tail.
2001-10-18 22:14:45 +00:00