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

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

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index eeca63a1bc9395fca7afcc992903b463e29cec87..9e1ccb26270190bba90beff7830267e025c984dc 100644 (file)
--- a/lisp/ChangeLog
+++ b/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

diff --git a/lisp/progmodes/cc-engine.el b/lisp/progmodes/cc-engine.el
index f86e4b2c48a4e3fc985b9dfe0ffe8d19829d5b7f..6b406b0d89cda9ef172b09dc4c49681dc63d3c4f 100644 (file)
--- 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))