Merge from emacs-24

[gnu-emacs] / src / nsterm.m

diff --git a/src/nsterm.m b/src/nsterm.m
index c36b9ed4554d0884d16c78aeabc507e748871839..8729fa55a9292ce88825c9664736d9a5ee743e18 100644 (file)
--- a/src/nsterm.m
+++ b/src/nsterm.m
@@ -7213,7 +7213,6 @@ if (cols > 0 && rows > 0)
   if (pixel_height == 0) pixel_height = 1;
   min_portion = 20 / pixel_height;
   [super setFrame: newRect];
-  [self display];
 /*  unblock_input (); */
 }