X-Git-Url: http://git.hcoop.net/bpt/emacs.git/blobdiff_plain/a084532342d401455a818a1132d4aa1bc58a0d69..9155e80d790aa289f0613ebb3e6d6ba647127bc9:/lisp/progmodes/cc-engine.el

diff --git a/lisp/progmodes/cc-engine.el b/lisp/progmodes/cc-engine.el
index f86e4b2c48..6b406b0d89 100644
--- a/lisp/progmodes/cc-engine.el
+++ b/lisp/progmodes/cc-engine.el
@@ -2219,7 +2219,8 @@ comment at the start of cc-engine.el for more info."
        ((and (not not-in-delimiter)	; inside a comment starter
 	     (not (bobp))
 	     (progn (backward-char)
-		    (and (not (looking-at "\\s!"))
+		    (and (not (and (memq 'category-properties c-emacs-features)
+				   (looking-at "\\s!")))
 			 (looking-at c-comment-start-regexp))))
 	(setq ty (if (looking-at c-block-comment-start-regexp) 'c 'c++)
 	      co-st (point))