*** src-o/xdisp.c	Sat Jan 20 14:37:55 1996
--- src/xdisp.c	Sun Jan 21 18:30:25 1996
***************
*** 1287,1293 ****
    if (update_mode_lines)
      w->update_mode_line = Qt;
  
!   if (FRAME_X_P (f)
        ?
  #if defined (USE_X_TOOLKIT) || defined (HAVE_NTGUI)
        FRAME_EXTERNAL_MENU_BAR (f) 
--- 1287,1293 ----
    if (update_mode_lines)
      w->update_mode_line = Qt;
  
!   if (FRAME_WINDOW_P (f)
        ?
  #if defined (USE_X_TOOLKIT) || defined (HAVE_NTGUI)
        FRAME_EXTERNAL_MENU_BAR (f) 
***************
*** 1333,1339 ****
  	  call1 (Vrun_hooks, Qmenu_bar_update_hook);
  	  FRAME_MENU_BAR_ITEMS (f) = menu_bar_items (FRAME_MENU_BAR_ITEMS (f));
  #if defined (USE_X_TOOLKIT) || defined (HAVE_NTGUI)
! 	  if (FRAME_X_P (f))
  	    set_frame_menubar (f, 0, 0);
  #endif /* USE_X_TOOLKIT || HAVE_NTGUI */
  
--- 1333,1339 ----
  	  call1 (Vrun_hooks, Qmenu_bar_update_hook);
  	  FRAME_MENU_BAR_ITEMS (f) = menu_bar_items (FRAME_MENU_BAR_ITEMS (f));
  #if defined (USE_X_TOOLKIT) || defined (HAVE_NTGUI)
! 	  if (FRAME_WINDOW_P (f))
  	    set_frame_menubar (f, 0, 0);
  #endif /* USE_X_TOOLKIT || HAVE_NTGUI */
  
***************
*** 1754,1760 ****
  
    /* When we reach a frame's selected window, redo the frame's menu bar.  */
    if (update_mode_line
!       && (FRAME_X_P (f)
  	  ?
  #if defined (USE_X_TOOLKIT) || defined (HAVE_NTGUI)
  	  FRAME_EXTERNAL_MENU_BAR (f) 
--- 1754,1760 ----
  
    /* When we reach a frame's selected window, redo the frame's menu bar.  */
    if (update_mode_line
!       && (FRAME_WINDOW_P (f)
  	  ?
  #if defined (USE_X_TOOLKIT) || defined (HAVE_NTGUI)
  	  FRAME_EXTERNAL_MENU_BAR (f)