Remove spurious reference to symbol category_properties.

cc-engine.el (c-state-pp-to-literal): Fixed here.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 5361e498f9d2e46b210f191ef0765f28c66f920a..7567c6323c8d58a2073c849ed70b2b569b9886b3 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,8 @@
+2014-11-26  Alan Mackenzie  <acm@muc.de>
+
+       Remove spurious reference to symbol category_properties.
+       * progmodes/cc-engine.el (c-state-pp-to-literal): Fix here.
+
 2014-11-26  Glenn Morris  <rgm@gnu.org>
 
        * arc-mode.el (archive-visit-single-files): Add :version.

diff --git a/lisp/progmodes/cc-engine.el b/lisp/progmodes/cc-engine.el
index e596f0713b4d6eadd0a4ade716b1063a91970dfa..a388b4276f938d0bb409f6ec22c2ca064908d314 100644 (file)
--- a/lisp/progmodes/cc-engine.el
+++ b/lisp/progmodes/cc-engine.el
@@ -2240,8 +2240,7 @@ 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 (and (memq 'category-properties c-emacs-features)
-                                  (looking-at "\\s!")))
+                   (and (not (looking-at "\\s!"))
                         (looking-at c-comment-start-regexp))))
        (setq ty (if (looking-at c-block-comment-start-regexp) 'c 'c++)
              co-st (point))