[Emacs-diffs] emacs/src frame.c ChangeLog

[Stefan Monnier]

CVSROOT:        /sources/emacs
Module name:    emacs
Changes by:     Stefan Monnier <monnier>        09/05/19 03:30:48

Modified files:
        src            : frame.c ChangeLog 

Log message:
        (do_switch_frame) [NS_IMPL_COCOA]: Don't raise any window.
        (delete_frame) [NS_IMPL_COCOA]: Instead, do it here.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/emacs/src/frame.c?cvsroot=emacs&r1=1.418&r2=1.419
http://cvs.savannah.gnu.org/viewcvs/emacs/src/ChangeLog?cvsroot=emacs&r1=1.7549&r2=1.7550

Patches:
Index: frame.c
===================================================================
RCS file: /sources/emacs/emacs/src/frame.c,v
retrieving revision 1.418
retrieving revision 1.419
diff -u -b -r1.418 -r1.419
--- frame.c     18 May 2009 08:01:51 -0000      1.418
+++ frame.c     19 May 2009 03:30:36 -0000      1.419
@@ -866,16 +866,6 @@
 
   Fselect_window (XFRAME (frame)->selected_window, norecord);
 
-#ifdef NS_IMPL_COCOA
-  /* Under NS, there is no system mechanism for choosing a new window to be
-     selected -- it is left to application code.  So the portion of THIS
-     application interfacing with NS needs to know about it. */
-  if (for_deletion && FRAME_VISIBLE_P (XFRAME (selected_frame))
-      && FRAME_LIVE_P (XFRAME (selected_frame))
-      && ! FRAME_ICONIFIED_P (XFRAME (selected_frame)))
-    Fraise_frame(Qnil);
-#endif
-
   /* We want to make sure that the next event generates a frame-switch
      event to the appropriate frame.  This seems kludgy to me, but
      before you take it out, make sure that evaluating something like
@@ -1423,6 +1413,15 @@
                break;
            }
        }
+#ifdef NS_IMPL_COCOA
+      else
+       /* Under NS, there is no system mechanism for choosing a new
+          window to get focus -- it is left to application code.
+          So the portion of THIS application interfacing with NS
+          needs to know about it.  We call Fraise_frame, but the
+          purpose is really to transfer focus.  */
+       Fraise_frame (frame1);
+#endif
 
       do_switch_frame (frame1, 0, 1, Qnil);
       sf = SELECTED_FRAME ();

Index: ChangeLog
===================================================================
RCS file: /sources/emacs/emacs/src/ChangeLog,v
retrieving revision 1.7549
retrieving revision 1.7550
diff -u -b -r1.7549 -r1.7550
--- ChangeLog   19 May 2009 00:27:03 -0000      1.7549
+++ ChangeLog   19 May 2009 03:30:39 -0000      1.7550
@@ -1,3 +1,8 @@
+2009-05-19  Stefan Monnier  <address@hidden>
+
+       * frame.c (do_switch_frame) [NS_IMPL_COCOA]: Don't raise any window.
+       (delete_frame) [NS_IMPL_COCOA]: Instead, do it here.
+
 2009-05-19  YAMAMOTO Mitsuharu  <address@hidden>
 
        * xterm.c (x_delete_display): Don't call XrmDestroyDatabase here.