aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJuri Linkov2005-12-20 21:38:27 +0000
committerJuri Linkov2005-12-20 21:38:27 +0000
commitc1d9dffd9a69144ddf27d46e67eaf7344fea0beb (patch)
tree106a0865d758ab513e67b19c012da164f1b30439
parent76a3c2cda578ae2954a64c704b4522b8e3168f35 (diff)
downloademacs-c1d9dffd9a69144ddf27d46e67eaf7344fea0beb.tar.gz
emacs-c1d9dffd9a69144ddf27d46e67eaf7344fea0beb.zip
(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. */)
746 746
747 XSETFRAME (Vmenu_updating_frame, f); 747 XSETFRAME (Vmenu_updating_frame, f);
748 } 748 }
749 Vmenu_updating_frame = Qnil; 749 else
750 Vmenu_updating_frame = Qnil;
750#endif /* HAVE_MENUS */ 751#endif /* HAVE_MENUS */
751 752
752 title = Qnil; 753 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. */)
738 738
739 XSETFRAME (Vmenu_updating_frame, f); 739 XSETFRAME (Vmenu_updating_frame, f);
740 } 740 }
741 Vmenu_updating_frame = Qnil; 741 else
742 Vmenu_updating_frame = Qnil;
742#endif /* HAVE_MENUS */ 743#endif /* HAVE_MENUS */
743 744
744 title = Qnil; 745 title = Qnil;