Mercurial > emacs
comparison src/keyboard.c @ 83545:034f67f59091
Merged from emacs@sv.gnu.org.
Patches applied:
* emacs@sv.gnu.org/emacs--devo--0--patch-479
Update from CVS
* emacs@sv.gnu.org/emacs--devo--0--patch-480
Update from CVS
* emacs@sv.gnu.org/emacs--devo--0--patch-481
Update from CVS
* emacs@sv.gnu.org/emacs--devo--0--patch-482
Merge from gnus--rel--5.10
* emacs@sv.gnu.org/emacs--devo--0--patch-483
Update from CVS
* emacs@sv.gnu.org/emacs--devo--0--patch-484
Update from CVS
* emacs@sv.gnu.org/emacs--devo--0--patch-485
Update from CVS
* emacs@sv.gnu.org/gnus--rel--5.10--patch-153
Merge from emacs--devo--0
* emacs@sv.gnu.org/gnus--rel--5.10--patch-154
Update from CVS
* emacs@sv.gnu.org/gnus--rel--5.10--patch-155
Update from CVS
git-archimport-id: lorentey@elte.hu--2004/emacs--multi-tty--0--patch-585
author | Karoly Lorentey <lorentey@elte.hu> |
---|---|
date | Sun, 03 Dec 2006 12:25:18 +0000 |
parents | 2d56e13fd23d 346f9b4afa15 |
children | c71725faff1a |
comparison
equal
deleted
inserted
replaced
83544:58cf725f5330 | 83545:034f67f59091 |
---|---|
2618 if (CONSP (Vunread_command_events)) | 2618 if (CONSP (Vunread_command_events)) |
2619 { | 2619 { |
2620 c = XCAR (Vunread_command_events); | 2620 c = XCAR (Vunread_command_events); |
2621 Vunread_command_events = XCDR (Vunread_command_events); | 2621 Vunread_command_events = XCDR (Vunread_command_events); |
2622 | 2622 |
2623 reread = 1; | |
2624 | |
2625 /* Undo what sit-for did when it unread additional keys | |
2626 inside universal-argument. */ | |
2627 | |
2628 if (CONSP (c) | |
2629 && EQ (XCAR (c), Qt)) | |
2630 { | |
2631 reread = 0; | |
2632 c = XCDR (c); | |
2633 } | |
2634 | |
2623 /* Undo what read_char_x_menu_prompt did when it unread | 2635 /* Undo what read_char_x_menu_prompt did when it unread |
2624 additional keys returned by Fx_popup_menu. */ | 2636 additional keys returned by Fx_popup_menu. */ |
2625 if (CONSP (c) | 2637 if (CONSP (c) |
2626 && EQ (XCDR (c), Qdisabled) | 2638 && EQ (XCDR (c), Qdisabled) |
2627 && (SYMBOLP (XCAR (c)) || INTEGERP (XCAR (c)))) | 2639 && (SYMBOLP (XCAR (c)) || INTEGERP (XCAR (c)))) |
2631 set used_mouse_menu accordingly. */ | 2643 set used_mouse_menu accordingly. */ |
2632 if (used_mouse_menu | 2644 if (used_mouse_menu |
2633 && (EQ (c, Qtool_bar) || EQ (c, Qmenu_bar))) | 2645 && (EQ (c, Qtool_bar) || EQ (c, Qmenu_bar))) |
2634 *used_mouse_menu = 1; | 2646 *used_mouse_menu = 1; |
2635 | 2647 |
2636 reread = 1; | |
2637 goto reread_for_input_method; | 2648 goto reread_for_input_method; |
2638 } | 2649 } |
2639 | 2650 |
2640 if (CONSP (Vunread_input_method_events)) | 2651 if (CONSP (Vunread_input_method_events)) |
2641 { | 2652 { |
11624 DEFVAR_LISP_NOPRO ("last-input-event", &last_input_char, | 11635 DEFVAR_LISP_NOPRO ("last-input-event", &last_input_char, |
11625 doc: /* Last input event. */); | 11636 doc: /* Last input event. */); |
11626 | 11637 |
11627 DEFVAR_LISP ("unread-command-events", &Vunread_command_events, | 11638 DEFVAR_LISP ("unread-command-events", &Vunread_command_events, |
11628 doc: /* List of events to be read as the command input. | 11639 doc: /* List of events to be read as the command input. |
11629 These events are processed first, before actual keyboard input. */); | 11640 These events are processed first, before actual keyboard input. |
11641 Events read from this list are not normally added to `this-command-keys', | |
11642 as they will already have been added once as they were read for the first time. | |
11643 An element of the form (t . EVENT) forces EVENT to be added to that list. */); | |
11630 Vunread_command_events = Qnil; | 11644 Vunread_command_events = Qnil; |
11631 | 11645 |
11632 DEFVAR_INT ("unread-command-char", &unread_command_char, | 11646 DEFVAR_INT ("unread-command-char", &unread_command_char, |
11633 doc: /* If not -1, an object to be read as next command input event. */); | 11647 doc: /* If not -1, an object to be read as next command input event. */); |
11634 | 11648 |