* lisp/progmodes/cc-engine.el (c-remove-stale-state-cache-backwards):

Don't hardcode point-min==1.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 654e886a3a4c5f5767d16fda125ea4360f0036fd..15646c6cde31a69da6c923f900d3c56768d669b0 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,5 +1,8 @@
 2011-11-18  Stefan Monnier  <monnier@iro.umontreal.ca>
 
+       * progmodes/cc-engine.el (c-remove-stale-state-cache-backwards):
+       Don't hardcode point-min==1.
+
        * eshell/esh-cmd.el (eshell-do-eval): Handle `setq' (bug#9907).
        (eshell-rewrite-for-command): Remove workaround.
        (eshell-do-pipelines, eshell-do-pipelines-synchronously)

diff --git a/lisp/progmodes/cc-engine.el b/lisp/progmodes/cc-engine.el
index 31a58e48f5093dc11799f55454aa0746cec18c14..8ac38c253fbb3eb8ccadf4c1ca77ca1546eab34f 100644 (file)
--- a/lisp/progmodes/cc-engine.el
+++ b/lisp/progmodes/cc-engine.el
@@ -2820,7 +2820,7 @@ comment at the start of cc-engine.el for more info."
                                        ; or `here' itself.
        here- here+                  ; start/end of macro around HERE, or HERE
        (here-bol (c-point 'bol here))
-       (too-far-back (max (- here c-state-cache-too-far) 1)))
+       (too-far-back (max (- here c-state-cache-too-far) (point-min))))
 
     ;; Remove completely irrelevant entries from `c-state-cache'.
     (while (and c-state-cache
@@ -2964,9 +2964,9 @@ comment at the start of cc-engine.el for more info."
            c-state-cache-good-pos nil
            c-state-min-scan-pos nil)
 
-;;; Truncate `c-state-cache' and set `c-state-cache-good-pos' to a value below
-;;; `here'.  To maintain its consistency, we may need to insert a new brace
-;;; pair.
+    ;; Truncate `c-state-cache' and set `c-state-cache-good-pos' to a value
+    ;; below `here'.  To maintain its consistency, we may need to insert a new
+    ;; brace pair.
     (let ((here-bol (c-point 'bol here))
          too-high-pa             ; recorded {/(/[ next above here, or nil.
          dropped-cons            ; was the last removed element a brace pair?