From: Alan Mackenzie <acm@muc.de>
Date: Sun, 25 Mar 2007 12:03:13 +0000 (+0000)
Subject: (c-before-change): Fix BOB bug.
X-Git-Tag: emacs-pretest-22.0.97~191
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=6bc7293bd698dd2375d259e614a41f86a0f72b1e;p=emacs.git

(c-before-change): Fix BOB bug.
---

diff --git a/lisp/progmodes/cc-mode.el b/lisp/progmodes/cc-mode.el
index 4e0b92d107c..f5da0eecc2e 100644
--- a/lisp/progmodes/cc-mode.el
+++ b/lisp/progmodes/cc-mode.el
@@ -509,9 +509,9 @@ preferably use the `c-mode-menu' language constant directly."
 	      type type-pos
 	      marked-id term-pos
 	      (end1
-	       (if (eq (get-text-property end 'face) 'font-lock-comment-face)
-		   (previous-single-property-change end 'face)
-		 end)))
+	       (or (and (eq (get-text-property end 'face) 'font-lock-comment-face)
+			(previous-single-property-change end 'face))
+		   end)))
 	  (when (>= end1 beg) ; Don't hassle about changes entirely in comments.
 	    ;; Find a limit for the search for a `c-type' property
 	    (while