[Emacs-diffs] master 7e24ac1: Remove spurious reference to symbol category_properties. cc-engine.el (c-state-pp-to-literal): Fixed here.

[Alan Mackenzie]

branch: master
commit 7e24ac11d4f458c6524c92caf8117db8f5fc0542
Author: Alan Mackenzie <address@hidden>
Date:   Wed Nov 26 16:42:55 2014 +0000

    Remove spurious reference to symbol category_properties.
    cc-engine.el (c-state-pp-to-literal): Fixed here.
---
 lisp/ChangeLog              |    5 +++++
 lisp/progmodes/cc-engine.el |    3 +--
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 5361e49..7567c63 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,8 @@
+2014-11-26  Alan Mackenzie  <address@hidden>
+
+       Remove spurious reference to symbol category_properties.
+       * progmodes/cc-engine.el (c-state-pp-to-literal): Fix here.
+
 2014-11-26  Glenn Morris  <address@hidden>
 
        * arc-mode.el (archive-visit-single-files): Add :version.
diff --git a/lisp/progmodes/cc-engine.el b/lisp/progmodes/cc-engine.el
index e596f07..a388b42 100644
--- 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))