From 2abcb06cab03cf9040348146fcc0e3e93ae24a58 Mon Sep 17 00:00:00 2001 From: Alan Mackenzie Date: Wed, 17 Feb 2016 11:53:01 +0000 Subject: [PATCH] Correct c-parse-state cache manipulation error. * lisp/progmodes/cc-engine.el (c-invalidate-state-cache-1): Correct a comparison bound. Amend comments. --- lisp/progmodes/cc-engine.el | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/lisp/progmodes/cc-engine.el b/lisp/progmodes/cc-engine.el index d4dcb1ca0e8..69a2a53d5c9 100644 --- a/lisp/progmodes/cc-engine.el +++ b/lisp/progmodes/cc-engine.el @@ -3241,7 +3241,7 @@ comment at the start of cc-engine.el for more info." ;; pair element into an open paren element. Doing that would mean that the ;; new open paren wouldn't have the required preceding paren pair element. ;; - ;; This function is called from c-after-change. + ;; This function is called from c-before-change. ;; The caches of non-literals: ;; Note that we use "<=" for the possibility of the second char of a two-char @@ -3265,7 +3265,7 @@ comment at the start of cc-engine.el for more info." ;; 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. + too-high-pa ; recorded {/(/[ next above or just below here, or nil. dropped-cons ; was the last removed element a brace pair? pa) ;; The easy bit - knock over-the-top bits off `c-state-cache'. @@ -3277,7 +3277,7 @@ comment at the start of cc-engine.el for more info." ;; Do we need to add in an earlier brace pair, having lopped one off? (if (and dropped-cons - (< too-high-pa (+ here c-state-cache-too-far))) + (<= too-high-pa here)) (c-append-lower-brace-pair-to-state-cache too-high-pa here here-bol)) (setq c-state-cache-good-pos (or (c-state-cache-after-top-paren) (c-state-get-min-scan-pos))))) -- 2.39.2