[Emacs-diffs] trunk r115363: Fix last fix (Bug#16036)

[Martin Rudalics]

------------------------------------------------------------
revno: 115363
revision-id: address@hidden
parent: address@hidden
committer: martin rudalics <address@hidden>
branch nick: trunk
timestamp: Tue 2013-12-03 12:33:13 +0100
message:
  Fix last fix (Bug#16036)
modified:
  src/xterm.c                    xterm.c-20091113204419-o5vbwnq5f7feedwu-244

=== modified file 'src/xterm.c'
--- a/src/xterm.c       2013-12-03 07:45:54 +0000
+++ b/src/xterm.c       2013-12-03 11:33:13 +0000
@@ -8638,20 +8638,18 @@
       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 */