1 files changed, 13 insertions, 0 deletions

diff --git a/src/ChangeLog b/src/ChangeLog
index c35206447f1..c370bdc0404 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,16 @@
+2014-04-04  Jan Djärv  <jan.h.d@swipnet.se>
+
+        Backport from trunk.
+        * nsterm.m (updateFrameSize:): If waiting for the tool bar and tool
+       bar is zero height, just return (Bug#16976).
+       (initFrameFromEmacs:): Initialize wait_for_tool_bar.
+
+       * nsterm.h (EmacsView): Add wait_for_tool_bar.
+
+       * nsmenu.m (update_frame_tool_bar): Return early if view or toolbar
+        is nil.  If waiting for toolbar to complete, force a redraw.
+        (free_frame_tool_bar): Set wait_for_tool_bar = NO (Bug#16976)
+
 2014-04-03  Ken Brown  <kbrown@cornell.edu>
 
         * Makefile.in (EMACS_MANIFEST): Update comment.  (Bug#17176)