1 files changed, 14 insertions, 0 deletions

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 1d3c92c4468..778fe3dedd6 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,17 @@
+2013-01-09  Alan Mackenzie  <acm@muc.de>
+
+        Fix bugs in the c-parse-state mechanism.  Reuse some markers
+        instead of continually generating new ones.
+
+        * progmodes/cc-engine.el (c-state-old-cpp-beg-marker)
+        (c-state-old-cpp-end-marker): New variables.
+        (c-append-lower-brace-pair-to-state-cache): Start a backward
+        search for "}" definitively outside CPP constructs.
+        (c-remove-stale-state-cache): Inform the caller of a need to
+        search back for a brace pair in certain circumstances.
+        (c-state-maybe-marker): New macro.
+        (c-parse-state): Reuse markers when appropriate.
+
 2013-01-09  Glenn Morris  <rgm@gnu.org>
 
         * simple.el (execute-extended-command): Doc fix.