aboutsummaryrefslogtreecommitdiffstats
path: root/lisp/progmodes
diff options
context:
space:
mode:
authorAlan Mackenzie2014-05-30 17:06:53 +0000
committerAlan Mackenzie2014-05-30 17:06:53 +0000
commit9155e80d790aa289f0613ebb3e6d6ba647127bc9 (patch)
tree2e22892e8fbc897602a18a31adc263497d1d31e0 /lisp/progmodes
parenta084532342d401455a818a1132d4aa1bc58a0d69 (diff)
downloademacs-9155e80d790aa289f0613ebb3e6d6ba647127bc9.tar.gz
emacs-9155e80d790aa289f0613ebb3e6d6ba647127bc9.zip
Guard (looking-at "\\s!") from XEmacs.
progmodes/cc-engine.el (c-state-pp-to-literal): add guard form.
Diffstat (limited to 'lisp/progmodes')
-rw-r--r--lisp/progmodes/cc-engine.el3
1 files changed, 2 insertions, 1 deletions
diff --git a/lisp/progmodes/cc-engine.el b/lisp/progmodes/cc-engine.el
index f86e4b2c48a..6b406b0d89c 100644
--- a/lisp/progmodes/cc-engine.el
+++ b/lisp/progmodes/cc-engine.el
@@ -2219,7 +2219,8 @@ comment at the start of cc-engine.el for more info."
2219 ((and (not not-in-delimiter) ; inside a comment starter 2219 ((and (not not-in-delimiter) ; inside a comment starter
2220 (not (bobp)) 2220 (not (bobp))
2221 (progn (backward-char) 2221 (progn (backward-char)
2222 (and (not (looking-at "\\s!")) 2222 (and (not (and (memq 'category-properties c-emacs-features)
2223 (looking-at "\\s!")))
2223 (looking-at c-comment-start-regexp)))) 2224 (looking-at c-comment-start-regexp))))
2224 (setq ty (if (looking-at c-block-comment-start-regexp) 'c 'c++) 2225 (setq ty (if (looking-at c-block-comment-start-regexp) 'c 'c++)
2225 co-st (point)) 2226 co-st (point))