aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorJan D2014-11-15 13:39:30 +0100
committerJan D2014-11-15 13:39:30 +0100
commit836c444db7c0e3bf99ed89ee6051da0cd8f5e628 (patch)
tree2bf51c89769e24e624dd26f2b937e9a093c21885 /src
parent71e866c066f719daf7e96a32113a482be269c534 (diff)
downloademacs-836c444db7c0e3bf99ed89ee6051da0cd8f5e628.tar.gz
emacs-836c444db7c0e3bf99ed89ee6051da0cd8f5e628.zip
Fixes: 18757
* nsterm.m (setFrame:): Remove call to display (Bug#18757).
Diffstat (limited to 'src')
-rw-r--r--src/ChangeLog4
-rw-r--r--src/nsterm.m1
2 files changed, 4 insertions, 1 deletions
diff --git a/src/ChangeLog b/src/ChangeLog
index d75a7ec124b..16ec7125967 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,7 @@
12014-11-15 Jan Djärv <jan.h.d@swipnet.se>
2
3 * nsterm.m (setFrame:): Remove call to display (Bug#18757).
4
12014-11-14 Jan Djärv <jan.h.d@swipnet.se> 52014-11-14 Jan Djärv <jan.h.d@swipnet.se>
2 6
3 * nsfns.m (x_set_foreground_color, x_set_background_color) 7 * nsfns.m (x_set_foreground_color, x_set_background_color)
diff --git a/src/nsterm.m b/src/nsterm.m
index 9415922c6c9..b3a4e08e5f6 100644
--- a/src/nsterm.m
+++ b/src/nsterm.m
@@ -7159,7 +7159,6 @@ if (cols > 0 && rows > 0)
7159 if (pixel_height == 0) pixel_height = 1; 7159 if (pixel_height == 0) pixel_height = 1;
7160 min_portion = 20 / pixel_height; 7160 min_portion = 20 / pixel_height;
7161 [super setFrame: newRect]; 7161 [super setFrame: newRect];
7162 [self display];
7163/* unblock_input (); */ 7162/* unblock_input (); */
7164} 7163}
7165 7164