diff options
| author | Mattias Engdegård <mattiase@acm.org> | 2019-04-19 22:24:35 +0200 |
|---|---|---|
| committer | Mattias Engdegård <mattiase@acm.org> | 2019-04-19 22:24:35 +0200 |
| commit | a59c41ee81568a5e56d7a6545be6d18b37ef2d60 (patch) | |
| tree | 6611be0a153834b657930191feda3756dae1a574 /lisp/progmodes | |
| parent | 0f8628490e3e06f2bfe14451626f55b2165d711c (diff) | |
| download | emacs-a59c41ee81568a5e56d7a6545be6d18b37ef2d60.tar.gz | |
Remove subsumed regexp branches
* lisp/progmodes/cc-mode.el (c-before-change-check-unbalanced-strings)
(c-after-change-mark-abnormal-strings): Remove `\r' subsumed by `.'.
Diffstat (limited to 'lisp/progmodes')
| -rw-r--r-- | lisp/progmodes/cc-mode.el | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/lisp/progmodes/cc-mode.el b/lisp/progmodes/cc-mode.el index 49268c4482e..fc4ba8f5891 100644 --- a/lisp/progmodes/cc-mode.el +++ b/lisp/progmodes/cc-mode.el @@ -1244,7 +1244,7 @@ Note that the style variables are always made local to the buffer." (goto-char (1+ end)) ; might be a newline. ;; In the following regexp, the initial \n caters for a newline getting ;; joined to a preceding \ by the removal of what comes between. - (re-search-forward "[\n\r]?\\(\\\\\\(.\\|\n\\|\r\\)\\|[^\\\n\r]\\)*" + (re-search-forward "[\n\r]?\\(\\\\\\(.\\|\n\\)\\|[^\\\n\r]\\)*" nil t) ;; We're at an EOLL or point-max. (setq c-new-END (max c-new-END (min (1+ (point)) (point-max)))) @@ -1371,7 +1371,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\\)\\|[^\"]\\)*") (looking-at (cdr (assq (char-before) c-string-innards-re-alist)))) (cond ((memq (char-after (match-end 0)) '(?\n ?\r)) |