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

[Chong Yidong]

CVSROOT:        /cvsroot/emacs
Module name:    emacs
Changes by:     Chong Yidong <cyd>      06/12/09 18:38:59

Index: xterm.c
===================================================================
RCS file: /cvsroot/emacs/emacs/src/xterm.c,v
retrieving revision 1.934
retrieving revision 1.935
diff -u -b -r1.934 -r1.935
--- xterm.c     8 Dec 2006 00:56:01 -0000       1.934
+++ xterm.c     9 Dec 2006 18:38:59 -0000       1.935
@@ -8753,20 +8753,26 @@
 {
   if (raise_flag)
     {
-      Lisp_Object frame;
-      const char *atom = "_NET_ACTIVE_WINDOW";
+      /* The following code is needed for `raise-frame' to work on
+        some versions of metacity; see Window Manager
+        Specification/Extended Window Manager Hints at
+        http://freedesktop.org/wiki/Standards_2fwm_2dspec
+
+        However, on other versions (metacity 2.17.2-1.fc7), it
+        reportedly causes hangs when resizing frames.  */
+
+      /* 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);
+      /* 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)));
+                                  Qnil))); */
     }
   else
     x_lower_frame (f);