[Emacs-diffs] Changes to emacs/lisp/progmodes/cc-engine.el

[Martin Stjernholm]

Index: emacs/lisp/progmodes/cc-engine.el
diff -c emacs/lisp/progmodes/cc-engine.el:1.25 
emacs/lisp/progmodes/cc-engine.el:1.26
*** emacs/lisp/progmodes/cc-engine.el:1.25      Thu Jul 25 09:23:27 2002
--- emacs/lisp/progmodes/cc-engine.el   Tue Aug 20 17:58:51 2002
***************
*** 642,649 ****
        (forward-char))
         ;; Skip preprocessor directives.
         ((and (looking-at "#[ \t]*[a-zA-Z0-9!]")
!            (progn (skip-chars-backward " \t")
!                   (bolp)))
        (end-of-line)
        (while (and (<= (point) lim)
                    (eq (char-before) ?\\)
--- 642,650 ----
        (forward-char))
         ;; Skip preprocessor directives.
         ((and (looking-at "#[ \t]*[a-zA-Z0-9!]")
!            (save-excursion
!              (skip-chars-backward " \t")
!              (bolp)))
        (end-of-line)
        (while (and (<= (point) lim)
                    (eq (char-before) ?\\)
***************
*** 1245,1250 ****
--- 1246,1256 ----
              (setq c-state-cache (cdr c-state-cache)))
          (setq pairs (car pairs))
          (setcar pairs (1- (car pairs)))
+         (when (consp (car-safe c-state-cache))
+           ;; There could already be a cons first in `c-state-cache'
+           ;; if we've jumped over an unbalanced open paren in a
+           ;; macro below.
+           (setq c-state-cache (cdr c-state-cache)))
          (setq c-state-cache (cons pairs c-state-cache)))
        (if last-pos
            ;; Prepare to loop, but record the open paren only if it's