* doc/lispref/text.texi (Special Properties): Clarify role of font-lock-face.

[bpt/emacs.git] / ChangeLog

diff --git a/ChangeLog b/ChangeLog
index 76bd252..cd73001 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,16 +1,27 @@
+2011-06-14  Jan Djärv  <jan.h.d@swipnet.se>
+
+       * configure.in: Add emacsgtkfixed.o to GTK_OBJ if HAVE_GTK3.
+
+2011-06-08  Paul Eggert  <eggert@cs.ucla.edu>
+
+       * lib/gnulib.mk, m4/gnulib-common.m4: Merge from gnulib.
+
+2011-06-07  Paul Eggert  <eggert@cs.ucla.edu>
+
+       * configure.in: Add --with-wide-int.
+       * INSTALL: Mention this.
+
+2011-06-06  Paul Eggert  <eggert@cs.ucla.edu>
+
+       Merge from gnulib.
+       * lib/careadlinkat.c, lib/careadlinkat.h, m4/gnulib-common.m4: Merge.
+
 2011-06-02  Paul Eggert  <eggert@cs.ucla.edu>
 
        * lib/allocator.h, lib/careadlinkat.c: Merge from gnulib.
 
 2011-05-30  Paul Eggert  <eggert@cs.ucla.edu>
 
-       Malloc failure behavior now depends on size of allocation.
-       * lib/allocator.h (struct allocator.die): New size arg.
-       * lib/careadlinkat.c (careadlinkat): Pass size to 'die' function.
-       If the actual problem is an ssize_t limitation, not a size_t or
-       malloc failure, fail with errno == ENAMETOOLONG instead of calling
-       'die'.  (Bug#8762)
-
        Use 'inline', not 'INLINE'.
        * configure.in (INLINE): Remove.
 
@@ -23,7 +34,7 @@
 
 2011-05-27  Paul Eggert  <eggert@cs.ucla.edu>
 
-       * doc/misc/texinfo.tex, lib/getopt.c, lib/intprops.h: Merge from gnulib.
+       * lib/getopt.c, lib/intprops.h: Merge from gnulib.
 
 2011-05-24  Glenn Morris  <rgm@gnu.org>