diff options
| author | Alan Mackenzie | 2019-03-29 10:34:51 +0000 |
|---|---|---|
| committer | Alan Mackenzie | 2019-03-29 10:34:51 +0000 |
| commit | 14e9a428c5e555c590629b4eeec7e754d7e7ae77 (patch) | |
| tree | 0f93fd5e562ebba2c262a3839b65a1e20622bc59 | |
| parent | eb6bbd9fb175cacdfdc54c1187f5785ed3858f2f (diff) | |
| download | emacs-14e9a428c5e555c590629b4eeec7e754d7e7ae77.tar.gz emacs-14e9a428c5e555c590629b4eeec7e754d7e7ae77.zip | |
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.el | 2 |
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." | |||
| 1366 | (unless (and (c-major-mode-is 'c++-mode) | 1366 | (unless (and (c-major-mode-is 'c++-mode) |
| 1367 | (c-maybe-re-mark-raw-string)) | 1367 | (c-maybe-re-mark-raw-string)) |
| 1368 | (if (c-unescaped-nls-in-string-p (1- (point))) | 1368 | (if (c-unescaped-nls-in-string-p (1- (point))) |
| 1369 | (looking-at "\\(\\\\\\(.\\|\n|\\\r\\)\\|[^\"]\\)*") | 1369 | (looking-at "\\(\\\\\\(.\\|\n\\|\r\\)\\|[^\"]\\)*") |
| 1370 | (looking-at (cdr (assq (char-before) c-string-innards-re-alist)))) | 1370 | (looking-at (cdr (assq (char-before) c-string-innards-re-alist)))) |
| 1371 | (cond | 1371 | (cond |
| 1372 | ((memq (char-after (match-end 0)) '(?\n ?\r)) | 1372 | ((memq (char-after (match-end 0)) '(?\n ?\r)) |