[Emacs-diffs] /srv/bzr/emacs/trunk r99592: Fix bug #5649: 23.1.92; Indentation problems in C mode.

[Alan Mackenzie]

------------------------------------------------------------
revno: 99592
committer: Alan Mackenzie <address@hidden>
branch nick: trunk
timestamp: Mon 2010-03-01 11:31:42 +0000
message:
  Fix bug #5649: 23.1.92; Indentation problems in C mode.
modified:
  lisp/ChangeLog
  lisp/progmodes/cc-engine.el

=== modified file 'lisp/ChangeLog'
--- a/lisp/ChangeLog    2010-02-28 23:37:19 +0000
+++ b/lisp/ChangeLog    2010-03-01 11:31:42 +0000
@@ -1,3 +1,8 @@
+2010-03-01  Alan Mackenzie  <address@hidden>
+
+       * cc-engine.el (c-remove-stale-state-cache): Take account of when
+       `good-pos' is in the same macro as `here'.  Fixes bug 5649.
+
 2010-02-28  Katsumi Yamaoka  <address@hidden>
 
        * menu-bar.el (menu-bar-manuals-menu): Fix typo.

=== modified file 'lisp/progmodes/cc-engine.el'
--- a/lisp/progmodes/cc-engine.el       2010-02-25 21:21:25 +0000
+++ b/lisp/progmodes/cc-engine.el       2010-03-01 11:31:42 +0000
@@ -2641,7 +2641,8 @@
        ;; (car c-state-cache).  There can be no open parens/braces/brackets
        ;; between `good-pos'/`good-pos-actual-macro-start' and (point-max),
        ;; due to the interface spec to this function.
-       (setq pos (if good-pos-actual-macro-end
+       (setq pos (if (and good-pos-actual-macro-end
+                          (> in-macro-start good-pos-actual-macro-start))
                      (1+ good-pos-actual-macro-end) ; get outside the macro as
                                        ; marked by a `category' text property.
                    good-pos))