aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAlan Mackenzie2012-04-11 15:32:30 +0000
committerAlan Mackenzie2012-04-11 15:32:30 +0000
commit0de3da9f2fdaa4259a3b53bb2faf96ee7109f51c (patch)
tree9a09499a9a9ae7637a8037b502b6a6a67943c2d1
parent932de51cdf76271b17eda370a41f77105cfd46ae (diff)
downloademacs-0de3da9f2fdaa4259a3b53bb2faf96ee7109f51c.tar.gz
emacs-0de3da9f2fdaa4259a3b53bb2faf96ee7109f51c.zip
Correct two search limits in c-before-change-check_<>-operators.
-rw-r--r--lisp/ChangeLog5
-rw-r--r--lisp/progmodes/cc-engine.el5
2 files changed, 7 insertions, 3 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index fdd3919b13b..cde248a979e 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,8 @@
12012-04-11 Alan Mackenzie <acm@muc.de>
2
3 * progmodes/cc-engine.el (c-before-change-check-<>-operators):
4 Correct two search limits.
5
12012-04-10 Stefan Monnier <monnier@iro.umontreal.ca> 62012-04-10 Stefan Monnier <monnier@iro.umontreal.ca>
2 7
3 * startup.el (command-line-1): Inhibit splash from daemon (bug#10996). 8 * startup.el (command-line-1): Inhibit splash from daemon (bug#10996).
diff --git a/lisp/progmodes/cc-engine.el b/lisp/progmodes/cc-engine.el
index cf38001c123..65e28c11e21 100644
--- a/lisp/progmodes/cc-engine.el
+++ b/lisp/progmodes/cc-engine.el
@@ -5382,7 +5382,7 @@ comment at the start of cc-engine.el for more info."
5382 new-beg new-end need-new-beg need-new-end) 5382 new-beg new-end need-new-beg need-new-end)
5383 ;; Locate the barrier before the changed region 5383 ;; Locate the barrier before the changed region
5384 (goto-char (if beg-lit-limits (car beg-lit-limits) beg)) 5384 (goto-char (if beg-lit-limits (car beg-lit-limits) beg))
5385 (c-syntactic-skip-backward "^;{}" (max (- beg 2048) (point-min))) 5385 (c-syntactic-skip-backward "^;{}" (c-determine-limit 512))
5386 (setq new-beg (point)) 5386 (setq new-beg (point))
5387 5387
5388 ;; Remove the syntax-table properties from each pertinent <...> pair. 5388 ;; Remove the syntax-table properties from each pertinent <...> pair.
@@ -5393,8 +5393,7 @@ comment at the start of cc-engine.el for more info."
5393 5393
5394 ;; Locate the barrier after END. 5394 ;; Locate the barrier after END.
5395 (goto-char (if end-lit-limits (cdr end-lit-limits) end)) 5395 (goto-char (if end-lit-limits (cdr end-lit-limits) end))
5396 (c-syntactic-re-search-forward "[;{}]" 5396 (c-syntactic-re-search-forward "[;{}]" (c-determine-+ve-limit 512) 'end)
5397 (min (+ end 2048) (point-max)) 'end)
5398 (setq new-end (point)) 5397 (setq new-end (point))
5399 5398
5400 ;; Remove syntax-table properties from the remaining pertinent <...> 5399 ;; Remove syntax-table properties from the remaining pertinent <...>