diff options
| author | Alan Mackenzie <acm@muc.de> | 2014-11-26 16:42:55 +0000 |
|---|---|---|
| committer | Alan Mackenzie <acm@muc.de> | 2014-11-26 16:42:55 +0000 |
| commit | 7e24ac11d4f458c6524c92caf8117db8f5fc0542 (patch) | |
| tree | a5e95902640d33aeb14876a1a23db02812ea2824 | |
| parent | 9740d86c30fb1ce37097a63c69924257f964c7ca (diff) | |
| download | emacs-7e24ac11d4f458c6524c92caf8117db8f5fc0542.tar.gz | |
Remove spurious reference to symbol category_properties.
cc-engine.el (c-state-pp-to-literal): Fixed here.
| -rw-r--r-- | lisp/ChangeLog | 5 | ||||
| -rw-r--r-- | lisp/progmodes/cc-engine.el | 3 |
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 @@ +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 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." ((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)) |