]> git.eshelyaron.com Git - emacs.git/commit
Backport from trunk.
authorJan Djärv <jan.h.d@swipnet.se>
Fri, 4 Apr 2014 16:32:24 +0000 (18:32 +0200)
committerJan Djärv <jan.h.d@swipnet.se>
Fri, 4 Apr 2014 16:32:24 +0000 (18:32 +0200)
commit11a9c72fafaa02ef26708da6ffe765a7fdaa4565
treee20e6c51747a69be7e81daa1ab1be642a7981043
parent97bac2112e7b4332834900863810370a57e38fbe
Backport from trunk.
       * 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

       * nsterm.h (EmacsView): Add wait_for_tool_bar.

* 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.
src/ChangeLog
src/nsmenu.m
src/nsterm.h
src/nsterm.m