From: Juri Linkov <juri@jurta.org>
Date: Tue, 20 Dec 2005 21:38:27 +0000 (+0000)
Subject: (Fx_popup_menu): Add `else' to set Vmenu_updating_frame to nil
X-Git-Tag: emacs-pretest-22.0.90~5162
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=c1d9dffd9a69144ddf27d46e67eaf7344fea0beb;p=emacs.git

(Fx_popup_menu): Add `else' to set Vmenu_updating_frame to nil
only if position is nil.
---

diff --git a/src/macmenu.c b/src/macmenu.c
index a68ff04e405..064cec57486 100644
--- a/src/macmenu.c
+++ b/src/macmenu.c
@@ -746,7 +746,8 @@ no quit occurs and `x-popup-menu' returns nil.  */)
 
       XSETFRAME (Vmenu_updating_frame, f);
     }
-  Vmenu_updating_frame = Qnil;
+  else
+    Vmenu_updating_frame = Qnil;
 #endif /* HAVE_MENUS */
 
   title = Qnil;
diff --git a/src/w32menu.c b/src/w32menu.c
index d441d14b259..dfd885eee08 100644
--- a/src/w32menu.c
+++ b/src/w32menu.c
@@ -738,7 +738,8 @@ cached information about equivalent key sequences.  */)
 
       XSETFRAME (Vmenu_updating_frame, f);
     }
-  Vmenu_updating_frame = Qnil;
+  else
+    Vmenu_updating_frame = Qnil;
 #endif /* HAVE_MENUS */
 
   title = Qnil;