Fix an off by one error in c-guess-basic-syntax CASE 5B.1.

[bpt/emacs.git] / ChangeLog

diff --git a/ChangeLog b/ChangeLog
index 605ef32..bc5b3fc 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,20 @@
+2012-01-31  Glenn Morris  <rgm@gnu.org>
+
+       * configure.in: Throw an explicit error if Motif toolkit was
+       requested but requirements could not be found.
+
+       * configure.in: Allow Emacs to actually be built with xaw scroll-bars.
+
+2012-01-30  Eli Zaretskii  <eliz@gnu.org>
+
+       * lib/makefile.w32-in ($(BLD)/sha1.$(O) $(BLD)/sha256.$(O)
+       $(BLD)/sha512.$(O)): Depend on stamp_BLD.  Fixes a build failure
+       with "make -j3".
+
+2012-01-16  Juanma Barranquero  <lekktu@gmail.com>
+
+       * .bzrignore: Ignore etc/__pycache__.
+
 2011-12-17  Paul Eggert  <eggert@cs.ucla.edu>
 
        Port HAVE_PTHREAD configuration to MirBSD 10 (Bug#10201).
@@ -10080,7 +10097,7 @@
 ;; coding: utf-8
 ;; End:
 
-  Copyright (C) 1993-1999, 2001-2011  Free Software Foundation, Inc.
+  Copyright (C) 1993-1999, 2001-2012  Free Software Foundation, Inc.
 
   This file is part of GNU Emacs.