# HG changeset patch
# User Adrian Robert <Adrian.B.Robert@gmail.com>
# Date 1236351182 0
# Node ID 3592fbfdbc63dc3bc558f87deb0d61952bb5e681
# Parent  03f8a267cd563daf7057e70db61ed9be15422e22
	* nsterm.m (x_set_window_size): Change back to calculated method
	of setting toolbar height under Cocoa.  (Bug#2546)
	(EmacsView-windowWillUseStandardFrame:defaultFrame:): New method.
	(EmacsView-drawRect:): Completely shortcircuit if ns_in_resize.

diff -r 03f8a267cd56 -r 3592fbfdbc63 src/ChangeLog
--- a/src/ChangeLog	Fri Mar 06 14:52:37 2009 +0000
+++ b/src/ChangeLog	Fri Mar 06 14:53:02 2009 +0000
@@ -1,3 +1,10 @@
+2009-03-06  Adrian Robert  <Adrian.B.Robert@gmail.com>
+
+	* nsterm.m (x_set_window_size): Change back to calculated method
+	of setting toolbar height under Cocoa.  (Bug#2546)
+	(EmacsView-windowWillUseStandardFrame:defaultFrame:): New method.
+	(EmacsView-drawRect:): Completely shortcircuit if ns_in_resize.
+
 2009-03-06  Kenichi Handa  <handa@m17n.org>
 
 	These changes are to detect incorrect composition sequence without
@@ -51,7 +58,7 @@
 
 2009-03-05  Adrian Robert  <Adrian.B.Robert@gmail.com>
 
-	* nsterm.m (ns_select): Shortcircuit if reentrant call.
+	* nsterm.m (ns_select): Shortcircuit if reentrant call.  (Bug#2564)
 
 2009-03-05  Kenichi Handa  <handa@m17n.org>