Merge from trunk.

1 files changed, 16 insertions, 3 deletions

diff --git a/src/ChangeLog b/src/ChangeLog
index cfcb22b5e41..dfe694c71a3 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,16 @@
+2012-04-15  Andreas Schwab  <schwab@linux-m68k.org>
+
+        * lisp.h (struct Lisp_Symbol): Remove explicit padding.
+        (struct Lisp_Misc_Any): Likewise.
+        (struct Lisp_Free): Likewise.
+        * alloc.c (union aligned_Lisp_Symbol): Define.
+        (SYMBOL_BLOCK_SIZE, struct symbol_block): Use union
+        aligned_Lisp_Symbol instead of struct Lisp_Symbol.
+        (union aligned_Lisp_Misc): Define.
+        (MARKER_BLOCK_SIZE, struct marker_block): Use union
+        aligned_Lisp_Misc instead of union Lisp_Misc.
+        (Fmake_symbol, allocate_misc, gc_sweep): Adjust
+
 2012-04-14  Paul Eggert  <eggert@cs.ucla.edu>
 
         configure: new option --enable-gcc-warnings (Bug#11207)
@@ -64,7 +77,7 @@
 
         * alloc.c (lisp_align_malloc): Remove unneeded prototype.
 
-2012-04-10  "Jason S. Cornez"  <jcornez@ravenpack.com>  (tiny change)
+2012-04-10  Jason S. Cornez  <jcornez@ravenpack.com>  (tiny change)
 
         * keyboard.c: Override inhibit-quit after the third C-g (bug#6585).
         (force_quit_count): New var.
@@ -1563,7 +1576,7 @@
         * xfns.c (unwind_create_frame): Fix comment.
         (Fx_create_frame, x_create_tip_frame):
         Move terminal->reference_count++ just before making the frame
-        official. Move initialization of image_cache_refcount and
+        official.  Move initialization of image_cache_refcount and
         dpyinfo_refcount before calling init_frame_faces (Bug#9943).
 
 2011-11-05  Eli Zaretskii  <eliz@gnu.org>
@@ -7336,7 +7349,7 @@
         * xfaces.c <Qunspecified>: Make extern again.
 
         * syntax.c: Include sys/types.h before including regex.h, as
-        required by Posix.
+        required by POSIX.
 
         * doc.c (get_doc_string): Improve the format passed to `error'.