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

[Steven Tamm]

Index: emacs/src/macfns.c
diff -c emacs/src/macfns.c:1.45 emacs/src/macfns.c:1.46
*** emacs/src/macfns.c:1.45     Mon Dec 27 17:27:30 2004
--- emacs/src/macfns.c  Wed Dec 29 17:25:02 2004
***************
*** 158,164 ****
  
  extern Lisp_Object Vwindow_system_version;
  
! #if 0 /* Use xstricmp instead. */
  /* compare two strings ignoring case */
  
  static int
--- 158,164 ----
  
  extern Lisp_Object Vwindow_system_version;
  
! #if 0 /* Use xstricmp instead.  */
  /* compare two strings ignoring case */
  
  static int
***************
*** 2261,2267 ****
  
  /* Create and set up the Mac window for frame F.  */
  
! extern install_window_handler (WindowPtr);
  
  static void
  mac_window (f)
--- 2261,2267 ----
  
  /* Create and set up the Mac window for frame F.  */
  
! extern OSErr install_window_handler (WindowPtr);
  
  static void
  mac_window (f)
***************
*** 2282,2288 ****
    if (FRAME_MAC_WINDOW (f))
      {
        SetWRefCon (FRAME_MAC_WINDOW (f), (long) f->output_data.mac);
!       install_window_handler (FRAME_MAC_WINDOW (f));
      }
  #else
    FRAME_MAC_WINDOW (f)
--- 2282,2292 ----
    if (FRAME_MAC_WINDOW (f))
      {
        SetWRefCon (FRAME_MAC_WINDOW (f), (long) f->output_data.mac);
!       if (install_window_handler (FRAME_MAC_WINDOW (f)) != noErr)
!       {
!         DisposeWindow (FRAME_MAC_WINDOW (f));
!         FRAME_MAC_WINDOW (f) = NULL;
!       }
      }
  #else
    FRAME_MAC_WINDOW (f)