[Emacs-diffs] /srv/bzr/emacs/emacs-24 r107810: Correct two search limits in c-before-change-check_<>-operators.

[Alan Mackenzie]

------------------------------------------------------------
revno: 107810
committer: Alan Mackenzie <address@hidden>
branch nick: emacs-24
timestamp: Wed 2012-04-11 15:32:30 +0000
message:
  Correct two search limits in c-before-change-check_<>-operators.
modified:
  lisp/ChangeLog
  lisp/progmodes/cc-engine.el

=== modified file 'lisp/ChangeLog'
--- a/lisp/ChangeLog    2012-04-10 17:53:31 +0000
+++ b/lisp/ChangeLog    2012-04-11 15:32:30 +0000
@@ -1,3 +1,8 @@
+2012-04-11  Alan Mackenzie  <address@hidden>
+
+       * progmodes/cc-engine.el (c-before-change-check-<>-operators):
+       Correct two search limits.
+
 2012-04-10  Stefan Monnier  <address@hidden>
 
        * startup.el (command-line-1): Inhibit splash from daemon (bug#10996).

=== modified file 'lisp/progmodes/cc-engine.el'
--- a/lisp/progmodes/cc-engine.el       2012-03-16 14:10:54 +0000
+++ b/lisp/progmodes/cc-engine.el       2012-04-11 15:32:30 +0000
@@ -5382,7 +5382,7 @@
          new-beg new-end need-new-beg need-new-end)
       ;; Locate the barrier before the changed region
       (goto-char  (if beg-lit-limits (car beg-lit-limits) beg))
-      (c-syntactic-skip-backward "^;{}" (max (- beg 2048) (point-min)))
+      (c-syntactic-skip-backward "^;{}" (c-determine-limit 512))
       (setq new-beg (point))
 
       ;; Remove the syntax-table properties from each pertinent <...> pair.
@@ -5393,8 +5393,7 @@
 
       ;; Locate the barrier after END.
       (goto-char (if end-lit-limits (cdr end-lit-limits) end))
-      (c-syntactic-re-search-forward "[;{}]"
-                                    (min (+ end 2048) (point-max)) 'end)
+      (c-syntactic-re-search-forward "[;{}]" (c-determine-+ve-limit 512) 'end)
       (setq new-end (point))
 
       ;; Remove syntax-table properties from the remaining pertinent <...>