diff options
| author | Kenichi Handa | 2014-07-05 23:07:57 +0900 |
|---|---|---|
| committer | Kenichi Handa | 2014-07-05 23:07:57 +0900 |
| commit | aeb894a9a06d84d29b93ca04432d7cbed366e665 (patch) | |
| tree | e2b73f9a76bc826c7a443e9a8d4fb3b49bdf7332 /src/menu.c | |
| parent | 763a11d0d0dcf543e89a22c98f55ea07c40ceefa (diff) | |
| parent | a984543a4488ed08778eb775d62f7091db117945 (diff) | |
| download | emacs-aeb894a9a06d84d29b93ca04432d7cbed366e665.tar.gz emacs-aeb894a9a06d84d29b93ca04432d7cbed366e665.zip | |
merge trunk
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 | |||
| 1529 | but I don't want to make one now. */ | 1529 | but I don't want to make one now. */ |
| 1530 | CHECK_WINDOW (window); | 1530 | CHECK_WINDOW (window); |
| 1531 | 1531 | ||
| 1532 | /* Note that xw_popup_dialog can call menu code, so | ||
| 1533 | Vmenu_updating_frame should be set (Bug#17891). */ | ||
| 1534 | eassert (f && FRAME_LIVE_P (f)); | ||
| 1535 | XSETFRAME (Vmenu_updating_frame, f); | ||
| 1536 | |||
| 1532 | /* Force a redisplay before showing the dialog. If a frame is created | 1537 | /* Force a redisplay before showing the dialog. If a frame is created |
| 1533 | just before showing the dialog, its contents may not have been fully | 1538 | just before showing the dialog, its contents may not have been fully |
| 1534 | drawn, as this depends on timing of events from the X server. Redisplay | 1539 | drawn, as this depends on timing of events from the X server. Redisplay |