From: Alan Mackenzie <acm@muc.de>
Date: Sun, 20 Feb 2011 18:35:30 +0000 (+0000)
Subject: .
X-Git-Tag: emacs-pretest-24.0.90~104^2~275^2~791
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=aa9c0efca422faa3191144860728cd55a557a7fc;p=emacs.git

.
---

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index a2a0d9d2069..11b63fec16b 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,8 @@
+2011-02-20  Alan Mackenzie  <acm@muc.de>
+
+	* progmodes/cc-cmds.el (c-beginning-of-statement): Avoid loop in
+	locating the beginning of a macro.  (Bug#7595)
+
 2011-02-20  Glenn Morris  <rgm@gnu.org>
 
 	* edmacro.el (edmacro-eight-bits): Make it a defcustom.
@@ -836,7 +841,7 @@
 	* progmodes/cc-cmds.el (c-forward-over-illiterals):
 	Continue parsing if we encounter a naked # (Bug#7595).
 	(c-beginning-of-statement): Avoid loop in locating the beginning
-	of a macro.
+	of a macro.  (Not actually committed until 2011-02-20, see above).
 
 2011-01-31  Chong Yidong  <cyd@stupidchicken.com>