[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Emacs-diffs] Changes to emacs/lisp/progmodes/cc-engine.el
From: |
Miles Bader |
Subject: |
[Emacs-diffs] Changes to emacs/lisp/progmodes/cc-engine.el |
Date: |
Fri, 04 Apr 2003 01:22:49 -0500 |
Index: emacs/lisp/progmodes/cc-engine.el
diff -c emacs/lisp/progmodes/cc-engine.el:1.27
emacs/lisp/progmodes/cc-engine.el:1.28
*** emacs/lisp/progmodes/cc-engine.el:1.27 Fri Oct 18 04:45:21 2002
--- emacs/lisp/progmodes/cc-engine.el Sat Mar 22 20:58:30 2003
***************
*** 1144,1150 ****
(let* ((here (point))
(c-macro-start (c-query-macro-start))
(in-macro-start (or c-macro-start (point)))
! old-state last-pos pairs pos)
;; Somewhat ugly use of c-check-state-cache to get rid of the
;; part of the state cache that is after point. Can't use
;; c-whack-state-after for the same reasons as in that function.
--- 1144,1150 ----
(let* ((here (point))
(c-macro-start (c-query-macro-start))
(in-macro-start (or c-macro-start (point)))
! old-state last-pos pairs pos save-pos)
;; Somewhat ugly use of c-check-state-cache to get rid of the
;; part of the state cache that is after point. Can't use
;; c-whack-state-after for the same reasons as in that function.
***************
*** 1225,1231 ****
(narrow-to-region (point-min) here)
(while pos
;; Find the balanced brace pairs.
! (setq pairs nil)
(while (and (setq last-pos (c-down-list-forward pos))
(setq pos (c-up-list-forward last-pos)))
(if (eq (char-before last-pos) ?{)
--- 1225,1232 ----
(narrow-to-region (point-min) here)
(while pos
;; Find the balanced brace pairs.
! (setq save-pos pos
! pairs nil)
(while (and (setq last-pos (c-down-list-forward pos))
(setq pos (c-up-list-forward last-pos)))
(if (eq (char-before last-pos) ?{)
***************
*** 1269,1275 ****
(progn
(setq pos (c-up-list-backward pos)
c-state-cache nil)
! (unless pos
(setq pos last-pos
c-parsing-error
(format "Unbalanced close paren at line %d"
--- 1270,1282 ----
(progn
(setq pos (c-up-list-backward pos)
c-state-cache nil)
! (when (or (not pos)
! ;; Emacs (up to at least 21.2) can get confused by
! ;; open parens in column zero inside comments: The
! ;; sexp functions can then misbehave and bring us
! ;; back to the same point again. Check this so that
! ;; we don't get an infinite loop.
! (>= pos save-pos))
(setq pos last-pos
c-parsing-error
(format "Unbalanced close paren at line %d"
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Emacs-diffs] Changes to emacs/lisp/progmodes/cc-engine.el,
Miles Bader <=