aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorAlan Third2017-09-21 21:53:30 +0100
committerAlan Third2017-09-21 22:08:48 +0100
commita81d5a3d3fcb76f6b074c2c721b80b1802135d41 (patch)
treef73e4a1ff4aede8b5f00f63da35eadbd39880b62 /src
parent0bf066d4b25c694cca6b1d24ac0aadc2b9ae05b1 (diff)
downloademacs-a81d5a3d3fcb76f6b074c2c721b80b1802135d41.tar.gz
emacs-a81d5a3d3fcb76f6b074c2c721b80b1802135d41.zip
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.
Diffstat (limited to 'src')
-rw-r--r--src/nsterm.m4
1 files changed, 2 insertions, 2 deletions
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,
1820 1820
1821 if (pixelwise) 1821 if (pixelwise)
1822 { 1822 {
1823 pixelwidth = width; 1823 pixelwidth = FRAME_TEXT_TO_PIXEL_WIDTH (f, width);
1824 pixelheight = height; 1824 pixelheight = FRAME_TEXT_TO_PIXEL_HEIGHT (f, height);
1825 } 1825 }
1826 else 1826 else
1827 { 1827 {