Github/emacs
2
0
Fork 1
mirror of git://git.sv.gnu.org/emacs.git synced 2026-02-17 01:34:21 +00:00
Code Issues Projects Releases Packages Wiki Activity

* menu.c (Fx_popup_dialog): Set Vmenu_updating_frame to avoid crash

Browse source 
caused by xw_popup_dialog in daemon mode (Bug#17891).
This commit is contained in:
Dmitry Antipov 2014-07-01 12:07:32 +04:00
parent 34ac10a87b
commit 9714dfd285
2 changed files with 7 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/ChangeLog
View file

@ -1,6 +1,8 @@
2014-07-01 Dmitry Antipov <dmantipov@yandex.ru>
* xfaces.c (init_frame_faces): Always realize basic faces (#Bug17889).
* menu.c (Fx_popup_dialog): Set Vmenu_updating_frame to avoid crash
caused by xw_popup_dialog in daemon mode (Bug#17891).
2014-06-30 Eli Zaretskii <eliz@gnu.org>

5
src/menu.c
View file

@ -1554,6 +1554,11 @@ for instance using the window manager, then this produces a quit and
but I don't want to make one now. */
CHECK_WINDOW (window);
/* Note that xw_popup_dialog can call menu code, so
Vmenu_updating_frame should be set (Bug#17891). */
eassert (f && FRAME_LIVE_P (f));
XSETFRAME (Vmenu_updating_frame, f);
/* Force a redisplay before showing the dialog. If a frame is created
just before showing the dialog, its contents may not have been fully
drawn, as this depends on timing of events from the X server. Redisplay