* window.c: Fix error introduced by previous patch.

[gnu-emacs] / ChangeLog

diff --git a/ChangeLog b/ChangeLog
index 095a4a7813a99c3eebd25c8b0fa68edeb2c232b2..f365153c63b8bd9c4c6a7d13c0f88ec2cc52c8da 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,15 @@
+2011-01-18  Paul Eggert  <eggert@cs.ucla.edu>
+
+       Minor cleanups for 'bzr status'
+       * .bzrignore: Add emacs-*/, the output of make-dist, and stamp-h1,
+       the output of config.guess.
+       * Makefile.in (top_distclean): Remove stamp-h1 too.
+
+       * configure.in (HAVE_ATTRIBUTE_ALIGNED): Arrange for this to be
+       defined if the compiler supports GCC-style __attribute__
+       ((__aligned__ ...)).  IBM AIX and Oracle Solaris Studio support
+       this syntax.
+
 2011-01-17  Paul Eggert  <eggert@cs.ucla.edu>
 
        Makefile.in: tidy up the building of lib