Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Open sidebar
emacs
emacs
Commits
a41240a3
Commit
a41240a3
authored
Jan 12, 2009
by
Martin Rudalics
Browse files
(read_char): Fix case where last_nonmenu_event
returned a bad value with submenus. (Bug#447)
parent
6bbd9b32
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
14 additions
and
2 deletions
+14
-2
src/ChangeLog
src/ChangeLog
+5
-0
src/keyboard.c
src/keyboard.c
+9
-2
No files found.
src/ChangeLog
View file @
a41240a3
2009-01-12 Martin Rudalics <rudalics@gmx.at>
* keyboard.c (read_char): Fix case where last_nonmenu_event
returned a bad value with submenus. (Bug#447)
2009-01-12 Chong Yidong <cyd@stupidchicken.com>
* xfaces.c (Finternal_set_lisp_face_attribute): If setting the
...
...
src/keyboard.c
View file @
a41240a3
...
...
@@ -2547,6 +2547,8 @@ read_char (commandflag, nmaps, maps, prev_event, used_mouse_menu, end_time)
if (CONSP (Vunread_command_events))
{
int was_disabled = 0;
c = XCAR (Vunread_command_events);
Vunread_command_events = XCDR (Vunread_command_events);
...
...
@@ -2567,12 +2569,17 @@ read_char (commandflag, nmaps, maps, prev_event, used_mouse_menu, end_time)
if (CONSP (c)
&& EQ (XCDR (c), Qdisabled)
&& (SYMBOLP (XCAR (c)) || INTEGERP (XCAR (c))))
c = XCAR (c);
{
was_disabled = 1;
c = XCAR (c);
}
/* If the queued event is something that used the mouse,
set used_mouse_menu accordingly. */
if (used_mouse_menu
&& (EQ (c, Qtool_bar) || EQ (c, Qmenu_bar)))
/* Also check was_disabled so last-nonmenu-event won't return
a bad value when submenus are involved. (Bug#447) */
&& (EQ (c, Qtool_bar) || EQ (c, Qmenu_bar) || was_disabled))
*used_mouse_menu = 1;
goto reread_for_input_method;
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment