Commit graph

1175 commits

Author SHA1 Message Date
Miles Bader
430d2ee291 Merge from emacs--devo--0
Revision: emacs@sv.gnu.org/emacs--unicode--0--patch-312
2008-01-09 01:21:15 +00:00
Nick Roberts
ee2e9728e4 (parse_menu_item): Don't enclose key bindings on
menu bar in parentheses.
2008-01-06 21:34:57 +00:00
Stefan Monnier
87df3c322b (read_key_sequence): Fix typo. 2008-01-03 21:56:05 +00:00
Miles Bader
d29ee6b1a1 Merge from emacs--devo--0
Revision: emacs@sv.gnu.org/emacs--unicode--0--patch-300
2007-12-16 05:08:49 +00:00
Stefan Monnier
6d0867e5f5 (Fcommand_execute): Call Qcall_interactively instead of
manipulating the backtrace manually.
(make_lispy_event): Merge the ASCII and MULTIBYTE cases.
(struct backtrace, backtrace_list): Remove.
(command_loop_1): Remove dead var `no_direct'.
2007-12-10 03:48:05 +00:00
Miles Bader
0bd5084171 Merge from emacs--devo--0
Revision: emacs@sv.gnu.org/emacs--unicode--0--patch-294
2007-12-06 09:51:45 +00:00
Michael Albinus
033b73e2e0 * config.in (HAVE_DBUS): Add.
* Makefile.in: (HAVE_DBUS): Add D-Bus definitions if defined.
(ALL_CFLAGS): Add ${DBUS_CFLAGS}.
(obj): Add $(DBUS_OBJ).
(LIBES): Add $(DBUS_LIBS).
(dbusbind.o): New target.

* dbusbind.c: New file.

* emacs.c (main): Call syms_of_dbusbind when HAVE_DBUS is defined.

* keyboard.c: All D-Bus related code is wrapped by "#ifdef HAVE_DBUS".
(Qdbus_event) New Lisp symbol.
(kbd_buffer_get_event, make_lispy_event): Handle DBUS_EVENT.
(gobble_input): Call xd_read_queued_messages, reading D-Bus
messages.
(keys_of_keyboard ): Define dbus-event.

* termhooks.h (event_kind): Add DBUS_EVENT when HAVE_DBUS is defined.
2007-12-02 16:23:40 +00:00
Andreas Schwab
4b7ab1c4bc (apply_modifiers): Fix typo. 2007-11-29 11:49:23 +00:00
Stefan Monnier
21ec2c4365 (KEY_TO_CHAR): New macro.
(parse_modifiers, apply_modifiers): Accept integer arguments.
(read_key_sequence): Use them to unify the "shift->unshift" mapping
for chars and symbol keys.
After doing such remapping, apply function-key-map again.
2007-11-28 04:45:32 +00:00
Andreas Schwab
9b6112e8c3 (Fevent_symbol_parse_modifiers): Fix declaration. 2007-11-15 23:00:45 +00:00
Stefan Monnier
58da34c73b * subr.el (event-modifiers): Use internal-event-symbol-parse-modifiers.
* keyboard.c (Fevent_symbol_parse_modifiers): New function.
(syms_of_keyboard): Defsubr it.
2007-11-15 16:03:00 +00:00
Miles Bader
f23d76bdef Merge from emacs--devo--0
Revision: emacs@sv.gnu.org/emacs--unicode--0--patch-283
2007-11-11 00:56:44 +00:00
Jason Rumney
ba991a0e56 * keyboard.c (discard_mouse_events, make_lispy_event) [WINDOWSNT]:
Remove W32_SCROLL_BAR_CLICK_EVENT.
(lispy_function_keys) [WINDOWSNT]: Add more keys.
(lispy_multimedia_keys) [WINDOWSNT]: New array.
(make_lispy_event) [WINDOWSNT]: Use it to translate
MULTIMEDIA_KEY_EVENT.
2007-11-09 12:19:21 +00:00
Stefan Monnier
1bc973c2e4 * keyboard.c (syms_of_keyboard): Initialize the initial_kboard.
(init_keyboard): Set current_kboard's window-system to nil.
(tty_read_avail_input): Typo.
* frame.c (make_initial_frame): Don't initialize the initial_kboard.
2007-10-31 19:25:32 +00:00
Miles Bader
18cd1f1a08 Merge from emacs--devo--0
Patches applied:

 * emacs--devo--0  (patch 902-908)

   - Update from CVS
   - Merge from emacs--rel--22

 * emacs--rel--22  (patch 131-137)

   - Update from CVS
   - Merge from gnus--rel--5.10

 * gnus--rel--5.10  (patch 261-262)

   - Update from CVS

Revision: emacs@sv.gnu.org/emacs--unicode--0--patch-278
2007-10-27 09:12:07 +00:00
Miles Bader
fdc9061358 Merge from emacs--rel--22
Patches applied:

 * emacs--rel--22  (patch 131-137)

   - Update from CVS
   - Merge from gnus--rel--5.10

 * gnus--rel--5.10  (patch 261-262)

   - Update from CVS

Revision: emacs@sv.gnu.org/emacs--devo--0--patch-908
2007-10-27 09:07:17 +00:00
Stefan Monnier
70b8d0a4a3 Make `window-system' into a keyboard-local variable (rather than
frame-local as done originally by multi-tty).

* startup.el (window-system): Remove.  Don't make it frame-local.

* keyboard.h (struct kboard): Add Vwindow_system.
* keyboard.c (init_kboard): Set a default for Vwindow_system.
(mark_kboards): Mark Vwindow_system.

* dispnew.c (syms_of_display) <window-system>: Declare terminal-local.
(init_display): Don't set the obsolete `window-system' frame-param.

* xterm.c (x_term_init):
* w32term.c (w32_create_terminal):
* term.c (init_tty): Set Vwindow_system.
* macterm.c (mac_create_terminal): Set a keyboard (missing piece of the
multi-tty merge maybe?), copied from w32term.c.  Set Vwindow_system.

* xfns.c (Fx_create_frame, x_create_tip_frame):
* w32fns.c (Fx_create_frame, x_create_tip_frame):
* macfns.c (Fx_create_frame):
Don't set the obsolete `window-system' frame-param.

* frame.h (Qwindow_system): Remove.
* frame.c (Qwindow_system): Remove.  In `syms_of_frame' as well.
(Fmake_terminal_frame): Don't set obsolete `window-system' frame-param.
2007-10-25 02:38:41 +00:00
Richard M. Stallman
3a704bd7e3 (Fcurrent_idle_time): Doc fix. 2007-10-24 08:23:01 +00:00
Stefan Monnier
0923785f3c (read_key_sequence): Trivial typo in comment. 2007-10-24 02:22:21 +00:00
Miles Bader
9c8020a8df Merge from emacs--devo--0
Patches applied:

 * emacs--devo--0  (patch 890-898)

   - Update from CVS
   - Merge from emacs--rel--22

 * emacs--rel--22  (patch 122-128)

   - Update from CVS
   - Merge from gnus--rel--5.10

 * gnus--rel--5.10  (patch 257-258)

   - Merge from emacs--rel--22
   - Update from CVS

Revision: emacs@sv.gnu.org/emacs--unicode--0--patch-270
2007-10-19 00:00:21 +00:00
Stefan Monnier
3278f20eee (read_key_sequence): Undo a change introduced by multi-tty
which caused key-translation-map to applied repeatedly (thus breaking
double-mode).
2007-10-18 22:07:34 +00:00
Stefan Monnier
9beb8baa1f * xfns.c (Fx_create_frame, Fx_display_list):
* window.c (window_fixed_size_p, enlarge_window, shrink_window_lowest_first):
* macterm.c (init_font_name_table):
* macfns.c (Fx_create_frame, Fx_display_list):
* lread.c (close_load_descs):
* keyboard.c (read_char_x_menu_prompt):
* fns.c (Fmember, Fmemql, Fdelete, Fset_char_table_parent):
* coding.c (code_convert_region_unwind): Test the type of an object
rather than just !NILP before extracting data from it.
2007-10-16 16:28:39 +00:00
Miles Bader
63655c8314 Merge from emacs--devo--0
Patches applied:

 * emacs--devo--0  (patch 887-889)

   - Update from CVS
   - Merge from emacs--rel--22

 * emacs--rel--22  (patch 116-121)

   - Update from CVS

Revision: emacs@sv.gnu.org/emacs--unicode--0--patch-268
2007-10-15 05:03:21 +00:00
Richard M. Stallman
219ccf1b79 Line break fix. 2007-10-14 18:53:16 +00:00
Eli Zaretskii
96a5affbc9 (append_tool_bar_item): Reformat last change. 2007-10-13 20:49:53 +00:00
Eli Zaretskii
1ea40aa2f3 Replace abs' with eabs'. 2007-10-13 12:48:57 +00:00
Eli Zaretskii
6bf377e264 (GROW_RAW_KEYBUF, menu_bar_items, menu_bar_item, append_tool_bar_item): Use
larger_vector.
2007-10-13 12:08:42 +00:00
Miles Bader
c73bd236f7 Merge from emacs--devo--0
Patches applied:

 * emacs--devo--0  (patch 866-879)

   - Merge multi-tty branch
   - Update from CVS
   - Merge from emacs--rel--22

Revision: emacs@sv.gnu.org/emacs--unicode--0--patch-257
2007-10-11 16:24:58 +00:00
Miles Bader
1af74d06e5 Merge from emacs--rel--22
Revision: emacs@sv.gnu.org/emacs--devo--0--patch-875
2007-10-09 08:52:57 +00:00
Stefan Monnier
4f4a84ec80 Add new `input-decode-map' keymap and use it for temrinal
escape sequences.
* keyboard.h (struct kboard): Add Vinput_decode_map.
Remove Vlocal_key_translation_map.
* keyboard.c (read_key_sequence): Add support for input-decode-map.
(init_kboard): Init input-decode-map.
Replace local-key-translation-map back with key-translation-map.
(syms_of_keyboard): Declare input-decode-map.
Remove local-key-translation-map.  Update docstrings.
(mark_kboards): Mark Vinput_decode_map.
Don't mark Vlocal_key_translation_map.
* keymap.c (Fdescribe_buffer_bindings): Describe input-decode-map.
Replace local-key-translation-map back with key-translation-map.
* term.c (term_get_fkeys_1, CONDITIONAL_REASSIGN):
Bind in input-decode-map rather than function-key-map.
2007-10-09 05:05:39 +00:00
Martin Rudalics
15d814840f (kbd_buffer_get_event): Break loop waiting for input
when there's an unread command event.
2007-10-06 09:43:17 +00:00
Glenn Morris
7a58fb43f6 Johannes Weiner <hannes at saeurebad.de>
(abs): Don't define abs now it's in lisp.h.
2007-09-23 02:03:36 +00:00
Stefan Monnier
71f44e7ad4 * termhooks.h (term_gpm): Delete. Use gpm_tty's NULLness instead.
(gpm_tty): Change its type.
* term.c (term_gpm): Delete.  Use gpm_tty's NULLness instead.
(gpm_tty): Change its type and initialize it.
(Fterm_open_connection): Check the frame is indeed a tty.  Use the new gpm_tty.
(Fterm_close_connection): Use the new gpm_tty.
* keyboard.c (tty_read_avail_input): Use the new gpm_tty.
* sysdep.c (init_sys_modes): term_gpm -> gpm_tty.
2007-09-21 17:10:48 +00:00
Stefan Monnier
bcc3646eaa (tty_read_avail_input): Use terminal->name as liveness status. 2007-09-20 21:21:08 +00:00
Jan Djärv
4a46077fa2 (abs): #undef before #define. 2007-09-14 06:22:20 +00:00
Glenn Morris
0bda13a26e (command_loop_1): Remove #ifdef C_ALLOCA block. 2007-09-12 07:19:55 +00:00
Jason Rumney
13899bc14c (discard_mouse_events): Discard it.
(make_lispy_event): Translate it to a lisp event.
(lispy_wheel_names): Add wheel-left and right events.
(syms_of_keyboard): Enlarge wheel_syms.
2007-09-04 21:42:39 +00:00
Jan Djärv
54c1ec7263 Qrtl is new.
(parse_tool_bar_item): Handle :rtl keyword.
(syms_of_keyboard): Intern :rtl keyword.
2007-09-02 16:59:00 +00:00
Romain Francoise
0a42be6da7 (Fset_input_mode): Don't call `Fset_quit_char' if QUIT hasn't been
provided.
2007-08-29 16:03:26 +00:00
Martin Rudalics
d0d3a31145 (syms_of_keyboard): Set up new Lisp variable
last-repeatable-command.
(init_kboard): Initialize Vlast_repeatable_command.
(command_loop_1): Set it to real_this_command unless that was
bound to an input event.
(mark_kboards): Mark it.
2007-08-29 09:01:48 +00:00
Miles Bader
8d9cc0b7ea Merge multi-tty branch
Revision: emacs@sv.gnu.org/emacs--devo--0--patch-866
2007-08-29 05:28:10 +00:00
Miles Bader
1bb9a689ac Merge from emacs--devo--0
Patches applied:

 * emacs--devo--0  (patch 857-865)

   - Update from CVS
   - Merge from emacs--rel--22
   - Update from CVS: lisp/emacs-lisp/avl-tree.el: New file.
   - Remove RCS keywords

 * emacs--rel--22  (patch 97-100)

   - Update from CVS
   - Merge from gnus--rel--5.10

 * gnus--rel--5.10  (patch 246-247)

   - Update from CVS

Revision: emacs@sv.gnu.org/emacs--unicode--0--patch-252
2007-08-29 05:03:40 +00:00
Jan Djärv
cf0590c451 Qrtl is new.
(parse_tool_bar_item): Handle :rtl keyword.
(syms_of_keyboard): Intern :rtl keyword.
2007-08-28 10:14:02 +00:00
Miles Bader
aaf34461ff Merge from emacs--devo--0
Patches applied:

 * emacs--devo--0  (patch 846-851)

   - Update from CVS
   - Merge from emacs--rel--22

 * emacs--rel--22  (patch 88-92)

   - Update from CVS
   - Merge from gnus--rel--5.10

 * gnus--rel--5.10  (patch 242-244)

   - Update from CVS

Revision: emacs@sv.gnu.org/emacs--multi-tty--0--patch-31
2007-08-13 13:51:08 +00:00
Miles Bader
b2e6b10fe2 Merge from emacs--devo--0
Patches applied:

 * emacs--devo--0  (patch 846-851)

   - Update from CVS
   - Merge from emacs--rel--22

 * emacs--rel--22  (patch 88-92)

   - Update from CVS
   - Merge from gnus--rel--5.10

 * gnus--rel--5.10  (patch 242-244)

   - Update from CVS

Revision: emacs@sv.gnu.org/emacs--unicode--0--patch-246
2007-08-13 13:48:35 +00:00
Miles Bader
37cc095b6a Merge from emacs--rel--22
Revision: emacs@sv.gnu.org/emacs--devo--0--patch-851
2007-08-13 13:41:28 +00:00
Glenn Morris
e0f24100c7 Replace `iff' in comments. 2007-08-08 07:49:21 +00:00
Miles Bader
9899d01a0c Merge from emacs--devo--0
Patches applied:

 * emacs--devo--0  (patch 824-838)

   - Update from CVS
   - Merge from emacs--rel--22
   - Remove lisp/erc/erc-nicklist.el
   - Update some .arch-inventory files
   - Fix void function definition error in cus-edit.el
   - Restore lisp/emacs-lisp/cl-loaddefs.el

 * emacs--rel--22  (patch 70-83)

   - Update from CVS
   - Remove lisp/erc/erc-nicklist.el
   - Update some .arch-inventory files
   - Indicate that emacs--devo--0--patch-834 does not need to be applied
   - Merge from gnus--rel--5.10
   - Restore lisp/emacs-lisp/cl-loaddefs.el

 * gnus--rel--5.10  (patch 239-241)

   - Merge from emacs--devo--0
   - Update from CVS

Revision: emacs@sv.gnu.org/emacs--multi-tty--0--patch-28
2007-07-31 05:50:45 +00:00
Miles Bader
e468b87f91 Merge from emacs--devo--0
Patches applied:

 * emacs--devo--0  (patch 824-831)

   - Update from CVS
   - Merge from emacs--rel--22

 * emacs--rel--22  (patch 70-74)

   - Update from CVS

Revision: emacs@sv.gnu.org/emacs--unicode--0--patch-238
2007-07-27 10:52:18 +00:00
Miles Bader
9aecacd08a Merge from emacs--rel--22
Patches applied:

 * emacs--rel--22  (patch 70-73)

   - Update from CVS

2007-07-25  Glenn Morris  <rgm@gnu.org>

   * Relicense all FSF files to GPLv3 or later.

Revision: emacs@sv.gnu.org/emacs--devo--0--patch-828
2007-07-26 05:28:10 +00:00