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

1 files changed, 2 insertions, 3 deletions

diff --git a/lisp/progmodes/cc-engine.el b/lisp/progmodes/cc-engine.el
index f4a8c0bf46f..4797cd4a8ca 100644
--- 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))