Merged from miles@gnu.org--gnu-2005 (patch 677)

Patches applied:

 * miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-677
   Update from CVS

git-archimport-id: lorentey@elte.hu--2004/emacs--multi-tty--0--patch-463

1 files changed, 4 insertions, 1 deletions

diff --git a/src/xmenu.c b/src/xmenu.c
index 3fd88a7ac2f..36f95d911f0 100644
--- a/src/xmenu.c
+++ b/src/xmenu.c
@@ -905,8 +905,11 @@ no quit occurs and `x-popup-menu' returns nil.  */)
 
       if (! FRAME_X_P (f))
         error ("Can not put X menu on non-X terminal");
+
+      XSETFRAME (Vmenu_updating_frame, f);
     }
-  Vmenu_updating_frame = Qnil;
+  else
+    Vmenu_updating_frame = Qnil;
 #endif /* HAVE_MENUS */
 
   record_unwind_protect (unuse_menu_items, Qnil);