From: Alan Mackenzie <acm@muc.de>
Date: Fri, 29 Mar 2019 10:34:51 +0000 (+0000)
Subject: Fix (again) regexp bug in CC Mode.
X-Git-Tag: emacs-27.0.90~3302
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=14e9a428c5e555c590629b4eeec7e754d7e7ae77;p=emacs.git

Fix (again) regexp bug in CC Mode.

* lisp/progmodes/cc-mode.el (c-after-change-mark-abnormal-strings): "|\\\r" ->
"\\|\r".
---

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))