Commit 543568b6 authored by Paul Eggert's avatar Paul Eggert
Browse files

Fix one more 2019-08-04 regex lint

Problem clarified by Mattias Engdegård in:
https://lists.gnu.org/r/emacs-devel/2019-08/msg00087.html
* lisp/isearch.el (isearch-symbol-regexp):
Remove \s@ from regexp as it cannot match.
parent 4cd41ba8
Pipeline #2757 passed with stage
in 55 minutes and 28 seconds
......@@ -2184,16 +2184,19 @@ matches arbitrary non-symbol whitespace. Otherwise if LAX is non-nil,
the beginning or the end of the string need not match a symbol boundary."
(let ((not-word-symbol-re
;; This regexp matches all syntaxes except word and symbol syntax.
;; FIXME: Replace it with something shorter if possible (bug#14602).
"\\(?:\\s-\\|\\s.\\|\\s(\\|\\s)\\|\\s\"\\|\\s\\\\|\\s/\\|\\s$\\|\\s'\\|\\s<\\|\\s>\\|\\s@\\|\\s!\\|\\s|\\)+"))
"\\(?:\\s-\\|\\s.\\|\\s(\\|\\s)\\|\\s\"\\|\\s\\\\|\\s/\\|\\s$\\|\\s'\\|\\s<\\|\\s>\\|\\s!\\|\\s|\\)+"))
(cond
((equal string "") "")
((string-match-p (format "\\`%s\\'" not-word-symbol-re) string) not-word-symbol-re)
((string-match-p (format "\\`%s\\'" not-word-symbol-re) string)
not-word-symbol-re)
(t (concat
(if (string-match-p (format "\\`%s" not-word-symbol-re) string) not-word-symbol-re
(if (string-match-p (format "\\`%s" not-word-symbol-re) string)
not-word-symbol-re
"\\_<")
(mapconcat 'regexp-quote (split-string string not-word-symbol-re t) not-word-symbol-re)
(if (string-match-p (format "%s\\'" not-word-symbol-re) string) not-word-symbol-re
(mapconcat 'regexp-quote (split-string string not-word-symbol-re t)
not-word-symbol-re)
(if (string-match-p (format "%s\\'" not-word-symbol-re) string)
not-word-symbol-re
(unless lax "\\_>")))))))
;; Search with lax whitespace
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment