diff options
| author | Paul Eggert | 2019-03-26 19:06:36 -0700 |
|---|---|---|
| committer | Paul Eggert | 2019-03-26 19:07:21 -0700 |
| commit | 5d6a314475704f3fbdb29f68c6929516230e8a98 (patch) | |
| tree | ad00278e70192b7bfb072b436a0aa607ed20a9a9 /lisp/erc | |
| parent | c8ec3108a3d0bd1955d21f40b3c0c3b36d55b20d (diff) | |
| download | emacs-5d6a314475704f3fbdb29f68c6929516230e8a98.tar.gz emacs-5d6a314475704f3fbdb29f68c6929516230e8a98.zip | |
2019-03-26 regex cleanup
Problems reported by Mattias Engdegård in:
https://lists.gnu.org/r/emacs-devel/2019-03/msg01028.html
* lisp/align.el (align-rules-list):
* lisp/speedbar.el (speedbar-check-read-only, speedbar-check-vc):
* lisp/vc/diff-mode.el (diff-add-change-log-entries-other-window):
* lisp/woman.el (woman-parse-numeric-arg):
Put "-" at end of character alternatives, since a range was not intended.
* lisp/erc/erc.el (font-lock):
* lisp/mail/footnote.el (cl-seq):
Avoid duplicate character alternatives by using cl-seq API.
* lisp/mail/footnote.el (footnote--current-regexp):
* lisp/textmodes/css-mode.el (css--font-lock-keywords):
Avoid repetition of repetition.
* lisp/net/webjump.el (webjump-url-encode):
Add ~ to character alternatives, and rewrite confusing range.
* lisp/progmodes/verilog-mode.el (verilog-compiler-directives)
(verilog-assignment-operator-re):
Remove duplicate.
* lisp/progmodes/verilog-mode.el (verilog-preprocessor-re):
* lisp/textmodes/css-mode.el (css--font-lock-keywords):
Don’t escape a char that doesn’t need it.
* lisp/textmodes/picture.el (picture-tab-chars): In docstring,
do not say regexp characters will be quoted; merely say in
another way that the syntax is that of character alternatives.
(picture-set-tab-stops, picture-tab-search): Don’t attempt
to regexp-quote picture-tab-chars.
(picture-tab-search): Quote \ in picture-tab-chars for
skip-chars-backwards, which treats \ differently than
regexp character alternatives do.
Diffstat (limited to 'lisp/erc')
| -rw-r--r-- | lisp/erc/erc.el | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/lisp/erc/erc.el b/lisp/erc/erc.el index bcaa3e45258..e34487de273 100644 --- a/lisp/erc/erc.el +++ b/lisp/erc/erc.el | |||
| @@ -67,6 +67,7 @@ | |||
| 67 | (load "erc-loaddefs" nil t) | 67 | (load "erc-loaddefs" nil t) |
| 68 | 68 | ||
| 69 | (eval-when-compile (require 'cl-lib)) | 69 | (eval-when-compile (require 'cl-lib)) |
| 70 | (require 'cl-seq) | ||
| 70 | (require 'font-lock) | 71 | (require 'font-lock) |
| 71 | (require 'pp) | 72 | (require 'pp) |
| 72 | (require 'thingatpt) | 73 | (require 'thingatpt) |
| @@ -2522,10 +2523,8 @@ Returns NICK unmodified unless `erc-lurker-trim-nicks' is | |||
| 2522 | non-nil." | 2523 | non-nil." |
| 2523 | (if erc-lurker-trim-nicks | 2524 | (if erc-lurker-trim-nicks |
| 2524 | (replace-regexp-in-string | 2525 | (replace-regexp-in-string |
| 2525 | (format "[%s]" | 2526 | (regexp-opt (cl-delete-duplicates |
| 2526 | (mapconcat (lambda (char) | 2527 | (mapcar #'char-to-string erc-lurker-ignore-chars))) |
| 2527 | (regexp-quote (char-to-string char))) | ||
| 2528 | erc-lurker-ignore-chars "")) | ||
| 2529 | "" nick) | 2528 | "" nick) |
| 2530 | nick)) | 2529 | nick)) |
| 2531 | 2530 | ||