diff options
Diffstat (limited to 'lisp/progmodes/cc-engine.el')
| -rw-r--r-- | lisp/progmodes/cc-engine.el | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/lisp/progmodes/cc-engine.el b/lisp/progmodes/cc-engine.el index 9eb95f69c48..ce7797b411a 100644 --- a/lisp/progmodes/cc-engine.el +++ b/lisp/progmodes/cc-engine.el @@ -2222,6 +2222,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) + ;; FIXME: We never add category-properties to + ;; c-emacs-features! (and (not (and (memq 'category-properties c-emacs-features) (looking-at "\\s!"))) (looking-at c-comment-start-regexp)))) @@ -4119,10 +4121,10 @@ comment at the start of cc-engine.el for more info." (c-end-of-current-token last-token-end-pos)) (setq last-token-end-pos (point)))))) ;; Inside a token. - (if lookbehind-submatch - ;; See the NOTE above. - (goto-char state-pos) - (goto-char (min last-token-end-pos bound)))) + (goto-char (if lookbehind-submatch + ;; See the NOTE above. + state-pos + (min last-token-end-pos bound)))) (t ;; A real match. |