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
61c2b0b3
Commit
61c2b0b3
authored
Jan 29, 2014
by
Jan Djärv
Browse files
* xmenu.c (create_and_show_popup_menu): Handle case when no key
is grabbed. Fixes: debbugs:16565
parent
1dcb169c
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
7 additions
and
0 deletions
+7
-0
src/ChangeLog
src/ChangeLog
+5
-0
src/xmenu.c
src/xmenu.c
+2
-0
No files found.
src/ChangeLog
View file @
61c2b0b3
2014-01-29 Jan Djärv <jan.h.d@swipnet.se>
* xmenu.c (create_and_show_popup_menu): Handle case when no key
is grabbed (Bug#16565).
2014-01-28 Martin Rudalics <rudalics@gmx.at>
* xdisp.c (last_max_ascent): Re-remove after erroneously
...
...
src/xmenu.c
View file @
61c2b0b3
...
...
@@ -1306,6 +1306,8 @@ create_and_show_popup_menu (struct frame *f, widget_value *first_wv,
for
(
i
=
0
;
i
<
5
;
i
++
)
if
(
FRAME_DISPLAY_INFO
(
f
)
->
grabbed
&
(
1
<<
i
))
break
;
// If keys aren't grabbed (i.e. a mouse up event), use 0.
if
(
i
==
5
)
i
=
0
;
}
/* Display the menu. */
...
...
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