summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJuri Linkov <juri@jurta.org>2005-12-20 21:38:27 +0000
committerJuri Linkov <juri@jurta.org>2005-12-20 21:38:27 +0000
commitc1d9dffd9a69144ddf27d46e67eaf7344fea0beb (patch)
tree106a0865d758ab513e67b19c012da164f1b30439
parent76a3c2cda578ae2954a64c704b4522b8e3168f35 (diff)
downloademacs-c1d9dffd9a69144ddf27d46e67eaf7344fea0beb.tar.gz
(Fx_popup_menu): Add `else' to set Vmenu_updating_frame to nil
only if position is nil.
-rw-r--r--src/macmenu.c3
-rw-r--r--src/w32menu.c3
2 files changed, 4 insertions, 2 deletions
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;