]> git.eshelyaron.com Git - emacs.git/commitdiff
Fix (again) regexp bug in CC Mode.
authorAlan Mackenzie <acm@muc.de>
Fri, 29 Mar 2019 10:34:51 +0000 (10:34 +0000)
committerAlan Mackenzie <acm@muc.de>
Fri, 29 Mar 2019 10:34:51 +0000 (10:34 +0000)
* lisp/progmodes/cc-mode.el (c-after-change-mark-abnormal-strings): "|\\\r" ->
"\\|\r".

lisp/progmodes/cc-mode.el

index c1fb6aa09157fba58926c384ac5eb479de96e071..b7812fa8f3d688bfc9d3963ac726902fe14f5b9b 100644 (file)
@@ -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))