[Emacs-diffs] Changes to emacs/src/xdisp.c

[Eli Zaretskii]

Index: emacs/src/xdisp.c
diff -c emacs/src/xdisp.c:1.749 emacs/src/xdisp.c:1.750
*** emacs/src/xdisp.c:1.749     Mon Apr 22 18:47:07 2002
--- emacs/src/xdisp.c   Fri Apr 26 19:39:05 2002
***************
*** 194,206 ****
  #ifdef WINDOWSNT
  #include "w32term.h"
  #endif
! #ifdef macintosh
  #include "macterm.h"
  #endif
  
  #define INFINITY 10000000
  
! #if defined (USE_X_TOOLKIT) || defined (HAVE_NTGUI) || defined (macintosh)
  extern void set_frame_menubar P_ ((struct frame *f, int, int));
  extern int pending_menu_activation;
  #endif
--- 194,206 ----
  #ifdef WINDOWSNT
  #include "w32term.h"
  #endif
! #ifdef MAC_OS
  #include "macterm.h"
  #endif
  
  #define INFINITY 10000000
  
! #if defined (USE_X_TOOLKIT) || defined (HAVE_NTGUI) || defined (MAC_OS)
  extern void set_frame_menubar P_ ((struct frame *f, int, int));
  extern int pending_menu_activation;
  #endif
***************
*** 7077,7083 ****
      return 0;
  
  /* The terminal frame is used as the first Emacs frame on the Mac OS.  */
! #ifndef macintosh
  #ifdef HAVE_WINDOW_SYSTEM
    /* When Emacs starts, selected_frame may be a visible terminal
       frame, even if we run under a window system.  If we let this
--- 7077,7083 ----
      return 0;
  
  /* The terminal frame is used as the first Emacs frame on the Mac OS.  */
! #ifndef MAC_OS8
  #ifdef HAVE_WINDOW_SYSTEM
    /* When Emacs starts, selected_frame may be a visible terminal
       frame, even if we run under a window system.  If we let this
***************
*** 7450,7456 ****
  
    if (FRAME_WINDOW_P (f)
        ?
! #if defined (USE_X_TOOLKIT) || defined (HAVE_NTGUI) || defined (macintosh)
        FRAME_EXTERNAL_MENU_BAR (f) 
  #else
        FRAME_MENU_BAR_LINES (f) > 0
--- 7450,7456 ----
  
    if (FRAME_WINDOW_P (f)
        ?
! #if defined (USE_X_TOOLKIT) || defined (HAVE_NTGUI) || defined (MAC_OS)
        FRAME_EXTERNAL_MENU_BAR (f) 
  #else
        FRAME_MENU_BAR_LINES (f) > 0
***************
*** 7501,7509 ****
          FRAME_MENU_BAR_ITEMS (f) = menu_bar_items (FRAME_MENU_BAR_ITEMS (f));
          
          /* Redisplay the menu bar in case we changed it.  */
! #if defined (USE_X_TOOLKIT) || defined (HAVE_NTGUI) || defined (macintosh)
          if (FRAME_WINDOW_P (f)
! #if defined (macintosh)
                /* All frames on Mac OS share the same menubar.  So only the
                   selected frame should be allowed to set it.  */
                && f == SELECTED_FRAME ()
--- 7501,7509 ----
          FRAME_MENU_BAR_ITEMS (f) = menu_bar_items (FRAME_MENU_BAR_ITEMS (f));
          
          /* Redisplay the menu bar in case we changed it.  */
! #if defined (USE_X_TOOLKIT) || defined (HAVE_NTGUI) || defined (MAC_OS)
          if (FRAME_WINDOW_P (f)
! #if defined (MAC_OS)
                /* All frames on Mac OS share the same menubar.  So only the
                   selected frame should be allowed to set it.  */
                && f == SELECTED_FRAME ()
***************
*** 10647,10653 ****
  
        if (FRAME_WINDOW_P (f))
        {
! #if defined (USE_X_TOOLKIT) || defined (HAVE_NTGUI) || defined (macintosh)
          redisplay_menu_p = FRAME_EXTERNAL_MENU_BAR (f);
  #else
          redisplay_menu_p = FRAME_MENU_BAR_LINES (f) > 0;
--- 10647,10653 ----
  
        if (FRAME_WINDOW_P (f))
        {
! #if defined (USE_X_TOOLKIT) || defined (HAVE_NTGUI) || defined (MAC_OS)
          redisplay_menu_p = FRAME_EXTERNAL_MENU_BAR (f);
  #else
          redisplay_menu_p = FRAME_MENU_BAR_LINES (f) > 0;
***************
*** 13379,13385 ****
    if (FRAME_X_P (f))
      return;
  #endif
! #ifdef macintosh
    if (FRAME_MAC_P (f))
      return;
  #endif
--- 13379,13385 ----
    if (FRAME_X_P (f))
      return;
  #endif
! #ifdef MAC_OS
    if (FRAME_MAC_P (f))
      return;
  #endif