summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAlan Mackenzie <acm@muc.de>2019-03-29 10:34:51 +0000
committerAlan Mackenzie <acm@muc.de>2019-03-29 10:34:51 +0000
commit14e9a428c5e555c590629b4eeec7e754d7e7ae77 (patch)
tree0f93fd5e562ebba2c262a3839b65a1e20622bc59
parenteb6bbd9fb175cacdfdc54c1187f5785ed3858f2f (diff)
downloademacs-14e9a428c5e555c590629b4eeec7e754d7e7ae77.tar.gz
Fix (again) regexp bug in CC Mode.
* lisp/progmodes/cc-mode.el (c-after-change-mark-abnormal-strings): "|\\\r" -> "\\|\r".
-rw-r--r--lisp/progmodes/cc-mode.el2
1 files changed, 1 insertions, 1 deletions
diff --git a/lisp/progmodes/cc-mode.el b/lisp/progmodes/cc-mode.el
index c1fb6aa0915..b7812fa8f3d 100644
--- a/lisp/progmodes/cc-mode.el
+++ b/lisp/progmodes/cc-mode.el
@@ -1366,7 +1366,7 @@ Note that the style variables are always made local to the buffer."
(unless (and (c-major-mode-is 'c++-mode)
(c-maybe-re-mark-raw-string))
(if (c-unescaped-nls-in-string-p (1- (point)))
- (looking-at "\\(\\\\\\(.\\|\n|\\\r\\)\\|[^\"]\\)*")
+ (looking-at "\\(\\\\\\(.\\|\n\\|\r\\)\\|[^\"]\\)*")
(looking-at (cdr (assq (char-before) c-string-innards-re-alist))))
(cond
((memq (char-after (match-end 0)) '(?\n ?\r))