(Fx_popup_menu): Set Vmenu_updating_frame to f if

position is non-nil, else set it to nil.

1 files changed, 4 insertions, 1 deletions

diff --git a/src/xmenu.c b/src/xmenu.c
index 468462a6ceb..c6640916f32 100644
--- a/src/xmenu.c
+++ b/src/xmenu.c
@@ -899,8 +899,11 @@ no quit occurs and `x-popup-menu' returns nil.  */)
 
       xpos += XINT (x);
       ypos += XINT (y);
+
+      XSETFRAME (Vmenu_updating_frame, f);
     }
-  Vmenu_updating_frame = Qnil;
+  else
+    Vmenu_updating_frame = Qnil;
 #endif /* HAVE_MENUS */
 
   record_unwind_protect (unuse_menu_items, Qnil);