From: Karl Heuer <kwzh@gnu.org>
Date: Mon, 29 May 1995 04:05:18 +0000 (+0000)
Subject: (update_menu_bar): Call set_frame_menubar with proper buffer current.
X-Git-Tag: emacs-19.34~3890
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=dcb9e676a79970fc9a287b23105032389f9d0e74;p=emacs.git

(update_menu_bar): Call set_frame_menubar with proper buffer current.
---

diff --git a/src/xdisp.c b/src/xdisp.c
index 6fb7a30ed01..3bff545f922 100644
--- a/src/xdisp.c
+++ b/src/xdisp.c
@@ -1261,11 +1261,11 @@ update_menu_bar (f, save_match_data)
 	  call1 (Vrun_hooks, Qmenu_bar_update_hook);
 	  current_buffer = XBUFFER (w->buffer);
 	  FRAME_MENU_BAR_ITEMS (f) = menu_bar_items (FRAME_MENU_BAR_ITEMS (f));
-	  current_buffer = prev;
 #ifdef USE_X_TOOLKIT
 	  set_frame_menubar (f, 0);
 #endif /* USE_X_TOOLKIT */
 
+	  current_buffer = prev;
 	  unbind_to (count, Qnil);
 	}
     }