[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Emacs-diffs] [emacs] 01/01: Fixes: 18757
From: |
Jan D. |
Subject: |
[Emacs-diffs] [emacs] 01/01: Fixes: 18757 |
Date: |
Sat, 15 Nov 2014 12:41:20 +0000 |
jhd pushed a commit to branch emacs-24
in repository emacs.
commit 836c444db7c0e3bf99ed89ee6051da0cd8f5e628
Author: Jan D <address@hidden>
Date: Sat Nov 15 13:39:30 2014 +0100
Fixes: 18757
* nsterm.m (setFrame:): Remove call to display (Bug#18757).
---
src/ChangeLog | 4 ++++
src/nsterm.m | 1 -
2 files changed, 4 insertions(+), 1 deletions(-)
diff --git a/src/ChangeLog b/src/ChangeLog
index d75a7ec..16ec712 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,7 @@
+2014-11-15 Jan Djärv <address@hidden>
+
+ * nsterm.m (setFrame:): Remove call to display (Bug#18757).
+
2014-11-14 Jan Djärv <address@hidden>
* nsfns.m (x_set_foreground_color, x_set_background_color)
diff --git a/src/nsterm.m b/src/nsterm.m
index 9415922..b3a4e08 100644
--- a/src/nsterm.m
+++ b/src/nsterm.m
@@ -7159,7 +7159,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 (); */
}