Merge from mainline.

2 files changed, 6 insertions, 6 deletions

diff --git a/src/ChangeLog b/src/ChangeLog
index 0bcad1118b6..c1f43f4313d 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,4 +1,4 @@
-2011-05-03  Paul Eggert  <eggert@cs.ucla.edu>
+2011-05-04  Paul Eggert  <eggert@cs.ucla.edu>
 
         Arithmetic overflows now return float rather than wrapping around.
         (Bug#8611).
@@ -108,6 +108,11 @@
 
         * fns.c (Frandom): Let EMACS_UINT be wider than unsigned long.
 
+2011-05-03  Jan Djärv  <jan.h.d@swipnet.se>
+
+        * xterm.c (x_set_frame_alpha): Do not set property on anything
+        else than FRAME_X_OUTER_WINDOW (Bug#8608).
+
 2011-05-02  Juanma Barranquero  <lekktu@gmail.com>
 
         * sysdep.c (get_tty_size) [WINDOWSNT]: Implement.  (Bug#8596)
diff --git a/src/xterm.c b/src/xterm.c
index 491a8b3698f..20259b7ab2e 100644
--- a/src/xterm.c
+++ b/src/xterm.c
@@ -454,11 +454,6 @@ x_set_frame_alpha (struct frame *f)
   double alpha_min = 1.0;
   unsigned long opac;
 
-  if (FRAME_X_DISPLAY_INFO (f)->root_window != FRAME_X_OUTPUT (f)->parent_desc)
-    /* Since the WM decoration lies under the FRAME_OUTER_WINDOW,
-       we must treat the former instead of the latter. */
-    win = FRAME_X_OUTPUT (f)->parent_desc;
-
   if (dpyinfo->x_highlight_frame == f)
     alpha = f->alpha[0];
   else