diff options
| author | Alan Mackenzie <acm@muc.de> | 2019-03-03 20:03:56 +0000 |
|---|---|---|
| committer | Alan Mackenzie <acm@muc.de> | 2019-03-03 20:03:56 +0000 |
| commit | 81ae21792b3d840a2f11e4c3a682e1e30799c37f (patch) | |
| tree | 3fc18aff722136ab95473328e13bf29b6feff7c0 /lisp | |
| parent | db3b3b350658e31c2668f2a14072d6ada9e2ae7c (diff) | |
| download | emacs-81ae21792b3d840a2f11e4c3a682e1e30799c37f.tar.gz emacs-81ae21792b3d840a2f11e4c3a682e1e30799c37f.tar.bz2 emacs-81ae21792b3d840a2f11e4c3a682e1e30799c37f.zip | |
Correct some slightly incorrect regular expressions:
* lisp/progmodes/cc-awk.el (c-awk-harmless-char-re)
(c-awk-harmless-line-char-re, c-awk-_-harmless-nonws-char-re): [...\\\\...]
-> [...\\...].
* lisp/progmodes/cc-engine.el (c-literal-limits): "*/" -> "\\*/".
* lisp/progmodes/cc-mode.el (c-after-change-re-mark-unbalanced-strings):
"\\\r" -> "\r".
Diffstat (limited to 'lisp')
| -rw-r--r-- | lisp/progmodes/cc-awk.el | 6 | ||||
| -rw-r--r-- | lisp/progmodes/cc-engine.el | 2 | ||||
| -rw-r--r-- | lisp/progmodes/cc-mode.el | 2 |
3 files changed, 5 insertions, 5 deletions
diff --git a/lisp/progmodes/cc-awk.el b/lisp/progmodes/cc-awk.el index bcb9d0430a3..70b1237cb8d 100644 --- a/lisp/progmodes/cc-awk.el +++ b/lisp/progmodes/cc-awk.el @@ -130,7 +130,7 @@ ;; REGEXPS FOR "HARMLESS" STRINGS/LINES. (defconst c-awk-harmless-_ "_\\([^\"]\\|\\'\\)") ;; Matches an underline NOT followed by ". -(defconst c-awk-harmless-char-re "[^_#/\"{}();\\\\\n\r]") +(defconst c-awk-harmless-char-re "[^_#/\"{}();\\\n\r]") ;; Matches any character not significant in the state machine applying ;; syntax-table properties to "s and /s. (defconst c-awk-harmless-string*-re @@ -141,7 +141,7 @@ (concat "\\=" c-awk-harmless-string*-re)) ;; Matches the (possibly empty) sequence of "insignificant" chars at point. -(defconst c-awk-harmless-line-char-re "[^_#/\"\\\\\n\r]") +(defconst c-awk-harmless-line-char-re "[^_#/\"\\\n\r]") ;; Matches any character but a _, #, /, ", \, or newline. N.B. _" starts a ;; localization string in gawk 3.1 (defconst c-awk-harmless-line-string*-re @@ -250,7 +250,7 @@ ;; which can precede an expression. ;; REGEXPS USED FOR FINDING THE POSITION OF A "virtual semicolon" -(defconst c-awk-_-harmless-nonws-char-re "[^#/\"\\\\\n\r \t]") +(defconst c-awk-_-harmless-nonws-char-re "[^#/\"\\\n\r \t]") (defconst c-awk-non-/-syn-ws*-re (concat "\\(" c-awk-escaped-nls*-with-space* diff --git a/lisp/progmodes/cc-engine.el b/lisp/progmodes/cc-engine.el index 27ce3029c4a..301d07c9c9c 100644 --- a/lisp/progmodes/cc-engine.el +++ b/lisp/progmodes/cc-engine.el @@ -5118,7 +5118,7 @@ comment at the start of cc-engine.el for more info." (setq beg (c-safe (c-backward-sexp 1) (point)))) ((and (c-safe (forward-char -2) t) - (looking-at "*/")) + (looking-at "\\*/")) ;; Block comment. Due to the nature of line ;; comments, they will always be covered by the ;; normal case above. diff --git a/lisp/progmodes/cc-mode.el b/lisp/progmodes/cc-mode.el index 6718813b79c..1b527094caa 100644 --- a/lisp/progmodes/cc-mode.el +++ b/lisp/progmodes/cc-mode.el @@ -1349,7 +1349,7 @@ Note that the style variables are always made local to the buffer." ;; We're at the start of a string. (memq (char-before) c-string-delims))) (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)) |