1 files changed, 9 insertions, 0 deletions

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 3671e2461aa..7c0fb21483f 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,12 @@
+2010-05-21  Alan Mackenzie  <acm@muc.de>
+
+        * progmodes/cc-engine.el (c-parse-state-get-strategy): Replace
+        parameter `here' with `here-' and `here-plus', which sandwich any
+        pertinent CPP construct.
+        (c-remove-stale-state-cache-backwards): Fix a bug which happens
+        when doing (c-parse-state) in a CPP construct: Exclude any "new"
+        CPP construct from taking part in the scanning.
+
 2010-05-21  Michael Albinus  <michael.albinus@gmx.de>
 
         * net/tramp.el (tramp-do-copy-or-rename-file)