[Emacs-diffs] emacs-24 r117332: * menu.c (Fx_popup_dialog): Set Vmenu_updating_frame to avoid crash

[Dmitry Antipov]

------------------------------------------------------------
revno: 117332
revision-id: address@hidden
parent: address@hidden
committer: Dmitry Antipov <address@hidden>
branch nick: emacs-24
timestamp: Tue 2014-07-01 12:07:32 +0400
message:
  * menu.c (Fx_popup_dialog): Set Vmenu_updating_frame to avoid crash
  caused by xw_popup_dialog in daemon mode (Bug#17891).
modified:
  src/ChangeLog                  changelog-20091113204419-o5vbwnq5f7feedwu-1438
  src/menu.c                     menu.c-20091113204419-o5vbwnq5f7feedwu-8676

=== modified file 'src/ChangeLog'
--- a/src/ChangeLog     2014-07-01 07:30:33 +0000
+++ b/src/ChangeLog     2014-07-01 08:07:32 +0000
@@ -1,6 +1,8 @@
 2014-07-01  Dmitry Antipov  <address@hidden>
 
        * 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  <address@hidden>
 

=== modified file 'src/menu.c'
--- a/src/menu.c        2014-04-16 13:27:28 +0000
+++ b/src/menu.c        2014-07-01 08:07:32 +0000
@@ -1554,6 +1554,11 @@
        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