Merge from emacs-24; up to 2014-04-01T20:18:12Z!eggert@cs.ucla.edu

1 files changed, 35 insertions, 1 deletions

diff --git a/src/ChangeLog b/src/ChangeLog
index b4722839fe3..d0d133c4989 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,37 @@
+2014-04-07  Stefan Monnier  <monnier@iro.umontreal.ca>
+
+        * lisp.h (struct Lisp_Symbol): New bitfield `pinned'.
+
+        * alloc.c: Keep track of symbols referenced from pure space (bug#17168).
+        (symbol_block_pinned): New var.
+        (Fmake_symbol): Initialize `pinned'.
+        (purecopy): New function, extracted from Fpurecopy.  Mark symbols as
+        pinned and signal an error for un-purifiable objects.
+        (pure_cons): Use it.
+        (Fpurecopy): Use it, except for objects that can't be purified.
+        (mark_pinned_symbols): New function.
+        (Fgarbage_collect): Use it.
+        (gc_sweep): Remove hack made unnecessary.
+
+2014-04-05  Glenn Morris  <rgm@gnu.org>
+
+        * keyboard.c (Fopen_dribble_file): Doc tweak.
+
+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)
+
 2014-04-07  Paul Eggert  <eggert@cs.ucla.edu>
 
         * alloc.c: Simplify by removing use of HAVE_EXECINFO_H.
@@ -4490,7 +4524,7 @@
         * frame.c (delete_frame): Block/unblock input to overcome race
         condition (Bug#15475).
 
-2013-09-29  Andreas Politz  <politza@hochschule-trier.de>  (tiny change)
+2013-09-29  Andreas Politz  <politza@hochschule-trier.de>
 
         * frame.c (delete_frame): Record selected frame only after
         calling Qdelete_frame_functions (Bug#15477).