1 files changed, 3 insertions, 3 deletions

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