2 files changed, 7 insertions, 7 deletions

diff --git a/src/ChangeLog b/src/ChangeLog
index 8e72ddbf9c4..9bc28de6813 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,7 @@
+2014-12-27  Jan Djärv  <jan.h.d@swipnet.se>
+
+        * xterm.c (do_ewmh_fullscreen): Don't remove maximized_horz/vert
+        when going to fullscreen (Bug#0x180004f).
 2014-12-27  Stefan Monnier  <monnier@iro.umontreal.ca>
 
         * buffer.c (syms_of_buffer) <Vafter_change_functions>: fix docstring.
diff --git a/src/xterm.c b/src/xterm.c
index 0640208ca14..130174dff19 100644
--- a/src/xterm.c
+++ b/src/xterm.c
@@ -9230,13 +9230,9 @@ do_ewmh_fullscreen (struct frame *f)
       switch (f->want_fullscreen)
         {
         case FULLSCREEN_BOTH:
-          if (cur == FULLSCREEN_WIDTH || cur == FULLSCREEN_MAXIMIZED
-              || cur == FULLSCREEN_HEIGHT)
-            set_wm_state (frame, false,
-                          dpyinfo->Xatom_net_wm_state_maximized_horz,
-                          dpyinfo->Xatom_net_wm_state_maximized_vert);
-          set_wm_state (frame, true,
-                        dpyinfo->Xatom_net_wm_state_fullscreen, None);
+          if (cur != FULLSCREEN_BOTH)
+            set_wm_state (frame, true, dpyinfo->Xatom_net_wm_state_fullscreen,
+                          None);
           break;
         case FULLSCREEN_WIDTH:
           if (cur == FULLSCREEN_BOTH || cur == FULLSCREEN_HEIGHT