From: Alan Third <alan@idiocy.org>
Date: Thu, 21 Sep 2017 20:53:30 +0000 (+0100)
Subject: Revert "Set frame size to actual requested size (bug#18215)"
X-Git-Tag: emacs-26.0.90~116
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=a81d5a3d3f;p=emacs.git

Revert "Set frame size to actual requested size (bug#18215)"

This reverts commit d31cd79b40dbd5459b16505a4ee4340210499277.

See bug#28536. I misunderstood bug#18215. It wasn't a bug.
---

diff --git a/src/nsterm.m b/src/nsterm.m
index 776635980e1..a41d6be2045 100644
--- a/src/nsterm.m
+++ b/src/nsterm.m
@@ -1820,8 +1820,8 @@ x_set_window_size (struct frame *f,
 
   if (pixelwise)
     {
-      pixelwidth = width;
-      pixelheight = height;
+      pixelwidth = FRAME_TEXT_TO_PIXEL_WIDTH (f, width);
+      pixelheight = FRAME_TEXT_TO_PIXEL_HEIGHT (f, height);
     }
   else
     {