From: Alan Mackenzie <acm@muc.de>
Date: Sat, 21 Jun 2008 08:45:03 +0000 (+0000)
Subject: *** empty log message ***
X-Git-Tag: emacs-pretest-22.2.90~114
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=6971de0774e58cb945a59a71be95b1f1b0e64b71;p=emacs.git

*** empty log message ***
---

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 98c7a540e9f..fdd47aa0759 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,8 @@
+2008-06-21  Alan Mackenzie  <acm@muc.de>
+
+	* progmodes/cc-engine.el (c-guess-basic-syntax CASE 5D.5): Fix an
+	infinite loop on invalid syntax.
+
 2008-06-11  Michael Albinus  <michael.albinus@gmx.de>
 
 	* net/tramp.el (tramp-make-temp-file): Backport from Tramp 2.1.