[Emacs-diffs] /srv/bzr/emacs/trunk r99594: Correct buggy patch 99592 to cc-engine.el.

[Alan Mackenzie]

------------------------------------------------------------
revno: 99594
committer: Alan Mackenzie <address@hidden>
branch nick: trunk
timestamp: Mon 2010-03-01 17:46:36 +0000
message:
  Correct buggy patch 99592 to cc-engine.el.
modified:
  lisp/ChangeLog
  lisp/progmodes/cc-engine.el

=== modified file 'lisp/ChangeLog'
--- a/lisp/ChangeLog    2010-03-01 11:50:57 +0000
+++ b/lisp/ChangeLog    2010-03-01 17:46:36 +0000
@@ -1,3 +1,8 @@
+2010-03-01  Alan Mackenzie  <address@hidden>
+
+       * progmodes/cc-engine.el (c-remove-stale-state-cache): Correct
+       previous patch.
+
 2010-03-01  Kenichi Handa  <address@hidden>
 
        * language/burmese.el (burmese-composable-pattern): Renamed from

=== modified file 'lisp/progmodes/cc-engine.el'
--- a/lisp/progmodes/cc-engine.el       2010-03-01 11:31:42 +0000
+++ b/lisp/progmodes/cc-engine.el       2010-03-01 17:46:36 +0000
@@ -2591,7 +2591,7 @@
   (save-restriction
     (narrow-to-region 1 (point-max))
     (save-excursion
-      (let* ((in-macro-start   ; point-max or beginning of macro containing it
+      (let* ((in-macro-start   ; start of macro containing (point-max) or nil.
              (save-excursion
                (goto-char (point-max))
                (and (c-beginning-of-macro)
@@ -2642,7 +2642,8 @@
        ;; between `good-pos'/`good-pos-actual-macro-start' and (point-max),
        ;; due to the interface spec to this function.
        (setq pos (if (and good-pos-actual-macro-end
-                          (> in-macro-start good-pos-actual-macro-start))
+                          (not (eq good-pos-actual-macro-start
+                                   in-macro-start)))
                      (1+ good-pos-actual-macro-end) ; get outside the macro as
                                        ; marked by a `category' text property.
                    good-pos))