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

[Jan Djärv]

CVSROOT:        /cvsroot/emacs
Module name:    emacs
Changes by:     Jan Djärv <jhd>        07/07/18 10:46:38

Index: xterm.c
===================================================================
RCS file: /cvsroot/emacs/emacs/src/xterm.c,v
retrieving revision 1.947
retrieving revision 1.948
diff -u -b -r1.947 -r1.948
--- xterm.c     8 Jun 2007 20:06:31 -0000       1.947
+++ xterm.c     18 Jul 2007 10:46:38 -0000      1.948
@@ -8853,22 +8853,15 @@
     }
 }
 
-static void
-XTframe_raise_lower (f, raise_flag)
+/* Activate frame with Extended Window Manager Hints */
+
+void
+x_ewmh_activate_frame (f)
      FRAME_PTR f;
-     int raise_flag;
 {
-  if (raise_flag)
-    {
-      /* The following code is needed for `raise-frame' to work on
-        some versions of metacity; see Window Manager
-        Specification/Extended Window Manager Hints at
+  /* See Window Manager Specification/Extended Window Manager Hints at
         http://freedesktop.org/wiki/Standards_2fwm_2dspec  */
 
-#if 0
-      /* However, on other versions (metacity 2.17.2-1.fc7), it
-        reportedly causes hangs when resizing frames.  */
-
       const char *atom = "_NET_ACTIVE_WINDOW";
       if (f->async_visible && wm_supports (f, atom))
         {
@@ -8881,10 +8874,15 @@
                                        Fcons (make_number (last_user_time),
                                               Qnil)));
         }
-      else
-#endif
+}
+
+static void
+XTframe_raise_lower (f, raise_flag)
+     FRAME_PTR f;
+     int raise_flag;
+{
+  if (raise_flag)
         x_raise_frame (f);
-    }
   else
     x_lower_frame (f);
 }