From: Martin Rudalics <rudalics@gmx.at>
Date: Tue, 3 Dec 2013 11:33:13 +0000 (+0100)
Subject: Fix last fix (Bug#16036)
X-Git-Tag: emacs-24.3.90~173^2^2~42^2~45^2~387^2~572
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=4525072b215933d69e409dfe8c2aaa73dc9f2bb9;p=emacs.git

Fix last fix (Bug#16036)
---

diff --git a/src/xterm.c b/src/xterm.c
index 60db9e107fe..a77279849d3 100644
--- a/src/xterm.c
+++ b/src/xterm.c
@@ -8638,20 +8638,18 @@ x_set_window_size (struct frame *f, int change_gravity, int width, int height, b
       change_frame_size (f, text_width, text_height, 0, 1, 0, 1);
     }
 
-  if (! pixelwise)
-    {
-      width = width * FRAME_COLUMN_WIDTH (f);
-      height = height * FRAME_LINE_HEIGHT (f);
-    }
-
 #ifdef USE_GTK
   if (FRAME_GTK_WIDGET (f))
-    xg_frame_set_char_size (f, width, height);
+    if (! pixelwise)
+      xg_frame_set_char_size (f, width * FRAME_COLUMN_WIDTH (f),
+			      height * FRAME_LINE_HEIGHT (f));
+    else
+      xg_frame_set_char_size (f, width, height);
   else
-    x_set_window_size_1 (f, change_gravity, width, height, 1);
+    x_set_window_size_1 (f, change_gravity, width, height, pixelwise);
 #else /* not USE_GTK */
 
-  x_set_window_size_1 (f, change_gravity, width, height, 1);
+  x_set_window_size_1 (f, change_gravity, width, height, pixelwise);
 
 #endif /* not USE_GTK */