Guard (looking-at "\\s!") from XEmacs.

progmodes/cc-engine.el (c-state-pp-to-literal): add guard form.

lisp/ChangeLog

@@ -1,3 +1,8 @@
+2014-05-30  Alan Mackenzie  <acm@muc.de>
+
+	Guard (looking-at "\\s!") from XEmacs.
+	* progmodes/cc-engine.el (c-state-pp-to-literal): add guard form.
+
 2014-05-30    Ken Olum  <kdo@cosmos.phy.tufts.edu>  (tiny change)
 
 	* mail/rmail.el (rmail-delete-forward, rmail-delete-backward): The

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))