diff options
| author | Glenn Morris <rgm@gnu.org> | 2014-07-02 23:00:53 -0700 |
|---|---|---|
| committer | Glenn Morris <rgm@gnu.org> | 2014-07-02 23:00:53 -0700 |
| commit | 2d3c9015c70fd05ac1bec42cc59d57c3fb6b82b5 (patch) | |
| tree | 572bc2de8c74eee49d8c49eb84a618b55fa3abf7 /src/menu.c | |
| parent | e993f8d5d39431545ac0071655071a740534917b (diff) | |
| parent | cbb6a7aeff3b901645ee8e4f2c4abeceafdfc073 (diff) | |
| download | emacs-2d3c9015c70fd05ac1bec42cc59d57c3fb6b82b5.tar.gz emacs-2d3c9015c70fd05ac1bec42cc59d57c3fb6b82b5.tar.bz2 emacs-2d3c9015c70fd05ac1bec42cc59d57c3fb6b82b5.zip | |
Merge from emacs-24; up to 2014-06-15T04:52:34Z!eli@barzilay.org
Diffstat (limited to 'src/menu.c')
| -rw-r--r-- | src/menu.c | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/src/menu.c b/src/menu.c index a523cfc6010..e0f226562f8 100644 --- a/src/menu.c +++ b/src/menu.c @@ -1529,6 +1529,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 |