[Emacs-diffs] Changes to emacs/src/xterm.c,v

[Jan Djärv]

CVSROOT:        /cvsroot/emacs
Module name:    emacs
Changes by:     Jan Djärv <jhd>        06/11/30 09:17:03

Index: xterm.c
===================================================================
RCS file: /cvsroot/emacs/emacs/src/xterm.c,v
retrieving revision 1.932
retrieving revision 1.933
diff -u -b -r1.932 -r1.933
--- xterm.c     17 Nov 2006 13:02:53 -0000      1.932
+++ xterm.c     30 Nov 2006 09:17:02 -0000      1.933
@@ -8723,23 +8723,10 @@
 x_raise_frame (f)
      struct frame *f;
 {
-  Lisp_Object frame;
-  const char *atom = "_NET_ACTIVE_WINDOW";
-
   BLOCK_INPUT;
   if (f->async_visible)
     XRaiseWindow (FRAME_X_DISPLAY (f), FRAME_OUTER_WINDOW (f));
 
-  XSETFRAME (frame, f);
-  /* See Window Manager Specification/Extended Window Manager Hints at
-     http://freedesktop.org/wiki/Standards_2fwm_2dspec */
-
-  Fx_send_client_event (frame, make_number (0), frame,
-                        make_unibyte_string (atom, strlen (atom)),
-                        make_number (32),
-                        Fcons (make_number (1),
-                               Fcons (make_number (time (NULL) * 1000),
-                                      Qnil)));
   XFlush (FRAME_X_DISPLAY (f));
   UNBLOCK_INPUT;
 }
@@ -8765,7 +8752,22 @@
      int raise_flag;
 {
   if (raise_flag)
+    {
+      Lisp_Object frame;
+      const char *atom = "_NET_ACTIVE_WINDOW";
+
     x_raise_frame (f);
+      /* See Window Manager Specification/Extended Window Manager Hints at
+         http://freedesktop.org/wiki/Standards_2fwm_2dspec */
+
+      XSETFRAME (frame, f);
+      Fx_send_client_event (frame, make_number (0), frame,
+                            make_unibyte_string (atom, strlen (atom)),
+                            make_number (32),
+                            Fcons (make_number (1),
+                                   Fcons (make_number (time (NULL) * 1000),
+                                          Qnil)));
+    }
   else
     x_lower_frame (f);
 }