* lisp/progmodes/sh-script.el (sh-font-lock-open-heredoc): Fix case

[bpt/emacs.git] / ChangeLog

diff --git a/ChangeLog b/ChangeLog
index ec53bb0..d75ec51 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,28 @@
+2011-02-09  Stefan Monnier  <monnier@iro.umontreal.ca>
+
+       * .bzrignore: Ignore globals.h and related stamp.
+
+2011-02-09  Paul Eggert  <eggert@cs.ucla.edu>
+
+       * lib/Makefile.in, lib/gnulib.mk: Regenerate.
+       This merges the following fix from gnulib:
+
+       2011-02-08  Bruno Haible  <bruno@clisp.org>
+
+       Split large sed scripts, for HP-UX sed.
+
+2011-02-08  Tom Tromey  <tromey@redhat.com>
+
+       * configure: Rebuild.
+       * configure.in (NS_OBJC_OBJ): New subst.
+
 2011-02-06  Paul Eggert  <eggert@cs.ucla.edu>
 
+       gnulib: allow multiple gnulib generated replacements to coexist
+       This defines a few preprocessor symbols that should not affect Emacs.
+       * lib/getopt.in.h, lib/time.in.h, lib/unistd.in.h: Regenerate
+       via "make sync-from-gnulib".
+
        gnulib: undo previous change
        The upstream _HEADERS change was backed out of gnulib (see the
        same thread).  Stay in sync with gnulib.