diff options
Diffstat (limited to 'src/ChangeLog')
| -rw-r--r-- | src/ChangeLog | 16 |
1 files changed, 9 insertions, 7 deletions
diff --git a/src/ChangeLog b/src/ChangeLog index c370bdc0404..9b084701933 100644 --- a/src/ChangeLog +++ b/src/ChangeLog | |||
| @@ -1,15 +1,17 @@ | |||
| 1 | 2014-04-05 Glenn Morris <rgm@gnu.org> | ||
| 2 | |||
| 3 | * keyboard.c (Fopen_dribble_file): Doc tweak. | ||
| 4 | |||
| 1 | 2014-04-04 Jan Djärv <jan.h.d@swipnet.se> | 5 | 2014-04-04 Jan Djärv <jan.h.d@swipnet.se> |
| 2 | 6 | ||
| 3 | Backport from trunk. | 7 | Backport from trunk. |
| 4 | * nsterm.m (updateFrameSize:): If waiting for the tool bar and tool | 8 | * nsterm.m (updateFrameSize:): If waiting for the tool bar and tool |
| 5 | bar is zero height, just return (Bug#16976). | 9 | bar is zero height, just return (Bug#16976). |
| 6 | (initFrameFromEmacs:): Initialize wait_for_tool_bar. | 10 | (initFrameFromEmacs:): Initialize wait_for_tool_bar. |
| 7 | 11 | * nsterm.h (EmacsView): Add wait_for_tool_bar. | |
| 8 | * nsterm.h (EmacsView): Add wait_for_tool_bar. | 12 | * nsmenu.m (update_frame_tool_bar): Return early if view or toolbar |
| 9 | |||
| 10 | * nsmenu.m (update_frame_tool_bar): Return early if view or toolbar | ||
| 11 | is nil. If waiting for toolbar to complete, force a redraw. | 13 | is nil. If waiting for toolbar to complete, force a redraw. |
| 12 | (free_frame_tool_bar): Set wait_for_tool_bar = NO (Bug#16976) | 14 | (free_frame_tool_bar): Set wait_for_tool_bar = NO (Bug#16976). |
| 13 | 15 | ||
| 14 | 2014-04-03 Ken Brown <kbrown@cornell.edu> | 16 | 2014-04-03 Ken Brown <kbrown@cornell.edu> |
| 15 | 17 | ||