aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAlan Mackenzie2014-11-26 16:42:55 +0000
committerAlan Mackenzie2014-11-26 16:42:55 +0000
commit7e24ac11d4f458c6524c92caf8117db8f5fc0542 (patch)
treea5e95902640d33aeb14876a1a23db02812ea2824
parent9740d86c30fb1ce37097a63c69924257f964c7ca (diff)
downloademacs-7e24ac11d4f458c6524c92caf8117db8f5fc0542.tar.gz
emacs-7e24ac11d4f458c6524c92caf8117db8f5fc0542.zip
Remove spurious reference to symbol category_properties.
cc-engine.el (c-state-pp-to-literal): Fixed here.
-rw-r--r--lisp/ChangeLog5
-rw-r--r--lisp/progmodes/cc-engine.el3
2 files changed, 6 insertions, 2 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 5361e498f9d..7567c6323c8 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,8 @@
12014-11-26 Alan Mackenzie <acm@muc.de>
2
3 Remove spurious reference to symbol category_properties.
4 * progmodes/cc-engine.el (c-state-pp-to-literal): Fix here.
5
12014-11-26 Glenn Morris <rgm@gnu.org> 62014-11-26 Glenn Morris <rgm@gnu.org>
2 7
3 * arc-mode.el (archive-visit-single-files): Add :version. 8 * arc-mode.el (archive-visit-single-files): Add :version.
diff --git a/lisp/progmodes/cc-engine.el b/lisp/progmodes/cc-engine.el
index e596f0713b4..a388b4276f9 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."
2240 ((and (not not-in-delimiter) ; inside a comment starter 2240 ((and (not not-in-delimiter) ; inside a comment starter
2241 (not (bobp)) 2241 (not (bobp))
2242 (progn (backward-char) 2242 (progn (backward-char)
2243 (and (not (and (memq 'category-properties c-emacs-features) 2243 (and (not (looking-at "\\s!"))
2244 (looking-at "\\s!")))
2245 (looking-at c-comment-start-regexp)))) 2244 (looking-at c-comment-start-regexp))))
2246 (setq ty (if (looking-at c-block-comment-start-regexp) 'c 'c++) 2245 (setq ty (if (looking-at c-block-comment-start-regexp) 'c 'c++)
2247 co-st (point)) 2246 co-st (point))