[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Emacs-diffs] emacs/src ChangeLog nsterm.m
From: |
Stefan Monnier |
Subject: |
[Emacs-diffs] emacs/src ChangeLog nsterm.m |
Date: |
Wed, 06 May 2009 02:49:37 +0000 |
CVSROOT: /sources/emacs
Module name: emacs
Changes by: Stefan Monnier <monnier> 09/05/06 02:49:37
Modified files:
src : ChangeLog nsterm.m
Log message:
(-windowDidResize:): Avoid inf-loop under GNUStep.
CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/emacs/src/ChangeLog?cvsroot=emacs&r1=1.7532&r2=1.7533
http://cvs.savannah.gnu.org/viewcvs/emacs/src/nsterm.m?cvsroot=emacs&r1=1.69&r2=1.70
Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/emacs/emacs/src/ChangeLog,v
retrieving revision 1.7532
retrieving revision 1.7533
diff -u -b -r1.7532 -r1.7533
--- ChangeLog 6 May 2009 02:27:51 -0000 1.7532
+++ ChangeLog 6 May 2009 02:49:35 -0000 1.7533
@@ -1,3 +1,7 @@
+2009-05-06 Stefan Monnier <address@hidden>
+
+ * nsterm.m (-windowDidResize:): Avoid inf-loop under GNUStep.
+
2009-05-06 YAMAMOTO Mitsuharu <address@hidden>
* keyboard.h (add_user_signal): Fix typo in extern.
Index: nsterm.m
===================================================================
RCS file: /sources/emacs/emacs/src/nsterm.m,v
retrieving revision 1.69
retrieving revision 1.70
diff -u -b -r1.69 -r1.70
--- nsterm.m 30 Apr 2009 16:52:19 -0000 1.69
+++ nsterm.m 6 May 2009 02:49:37 -0000 1.70
@@ -1151,10 +1151,10 @@
pixelheight = FRAME_TEXT_LINES_TO_PIXEL_HEIGHT (f, rows);
/* If we have a toolbar, take its height into account. */
- /* XXX: GNUstep has not yet implemented the first method below, added
- in Panther, however the second is incorrect under Cocoa. */
if (tb)
FRAME_NS_TOOLBAR_HEIGHT (f) =
+ /* XXX: GNUstep has not yet implemented the first method below, added
+ in Panther, however the second is incorrect under Cocoa. */
#ifdef NS_IMPL_COCOA
NSHeight ([window frameRectForContentRect: NSMakeRect (0, 0, 0, 0)])
/* NOTE: previously this would generate wrong result if toolbar not
@@ -5059,8 +5059,14 @@
}
#endif /* NS_IMPL_COCOA */
+ // Calling x_set_window_size tends to get us into inf-loops
+ // (x_set_window_size causes a resize which causes
+ // a "windowDidResize" which calls x_set_window_size).
+ // At least with GNUStep, don't know about MacOSX. --Stef
+#ifndef NS_IMPL_GNUSTEP
if (cols > 0 && rows > 0)
x_set_window_size (emacsframe, 0, cols, rows);
+#endif
ns_send_appdefined (-1);
}
- [Emacs-diffs] emacs/src ChangeLog nsterm.m,
Stefan Monnier <=