Reverse 2010-03-01T17:46:36Z!acm@muc.de "Correct buggy patch 2010-03-01T11:31:42Z...

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index c74aef90b3c1c28ab21c5325ab4bb383abb1cc9c..08483c3a61d74ce66138998a510c1507c00bb711 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -282,11 +282,6 @@
        * calendar/cal-hebrew.el (holiday-hebrew-passover): Fix date
        of Yom HaAtzma'ut when it falls on a Monday (rule changed in 2004).
 
-2010-03-01  Alan Mackenzie  <acm@muc.de>
-
-       * progmodes/cc-engine.el (c-remove-stale-state-cache):
-       Correct previous patch.
-
 2010-03-01  Kenichi Handa  <handa@m17n.org>
 
        * language/burmese.el (burmese-composable-pattern): Rename from

diff --git a/lisp/progmodes/cc-engine.el b/lisp/progmodes/cc-engine.el
index f4a8c0bf46fbd9de568564d3513b5be4e4c4a181..4797cd4a8cab8725dbd9e21103a6e7de72b7f668 100644 (file)
--- a/lisp/progmodes/cc-engine.el
+++ b/lisp/progmodes/cc-engine.el
@@ -2591,7 +2591,7 @@ comment at the start of cc-engine.el for more info."
   (save-restriction
     (narrow-to-region 1 (point-max))
     (save-excursion
-      (let* ((in-macro-start   ; start of macro containing (point-max) or nil.
+      (let* ((in-macro-start   ; point-max or beginning of macro containing it
              (save-excursion
                (goto-char (point-max))
                (and (c-beginning-of-macro)
@@ -2642,8 +2642,7 @@ comment at the start of cc-engine.el for more info."
        ;; 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
-                          (not (eq good-pos-actual-macro-start
-                                   in-macro-start)))
+                          (> 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))