diff options
| author | Glenn Morris <rgm@gnu.org> | 2018-06-26 07:51:01 -0700 |
|---|---|---|
| committer | Glenn Morris <rgm@gnu.org> | 2018-06-26 07:51:01 -0700 |
| commit | 513b97c0e94f5c25dd9ac82aea86c9eba248589d (patch) | |
| tree | 08bfa10e294e43635ec5e03a375ae0837de5040f /lisp/emacs-lisp/regexp-opt.el | |
| parent | 61f73703c74756e6963cc622f03bcc6938ab71b2 (diff) | |
| parent | 12c77f6918c4a60dbbae3f716a58300b4026e8da (diff) | |
| download | emacs-513b97c0e94f5c25dd9ac82aea86c9eba248589d.tar.gz emacs-513b97c0e94f5c25dd9ac82aea86c9eba248589d.tar.bz2 emacs-513b97c0e94f5c25dd9ac82aea86c9eba248589d.zip | |
Merge from origin/emacs-26
12c77f6 (origin/emacs-26) Add ido-fallback special variable (Bug#31707)
826e8d1 Merge branch 'emacs-26' of git.sv.gnu.org:/srv/git/emacs into...
c784876 Tighten a cross-reference in documentation
517dc0b Fix last change in tramp-sh.el
f43186f Revert previous patch; comment was OK after all.
4c3306e Fix lead comment for count_trailing_zero_bits
b419f27 ; * doc/emacs/files.texi (Interlocking): Fix a non-portable @...
7488de4 * lisp/emacs-lisp/regexp-opt.el (regexp-opt): Fix docstring q...
0b69807 Make a minor update to the CSS mode docstring
9a53b6d Say how to override a primitive interactive spec
1d77078 Fix Bug#31941
Diffstat (limited to 'lisp/emacs-lisp/regexp-opt.el')
| -rw-r--r-- | lisp/emacs-lisp/regexp-opt.el | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/lisp/emacs-lisp/regexp-opt.el b/lisp/emacs-lisp/regexp-opt.el index 3e05b6cb8c9..8de4959c10a 100644 --- a/lisp/emacs-lisp/regexp-opt.el +++ b/lisp/emacs-lisp/regexp-opt.el @@ -117,12 +117,12 @@ than that of a simplified version: (defun simplified-regexp-opt (strings &optional paren) (let ((parens (cond ((stringp paren) (cons paren \"\\\\)\")) - ((eq paren 'words) '(\"\\\\\\=<\\\\(\" . \"\\\\)\\\\>\")) - ((eq paren 'symbols) '(\"\\\\_<\\\\(\" . \"\\\\)\\\\_>\")) - ((null paren) '(\"\\\\(?:\" . \"\\\\)\")) - (t '(\"\\\\(\" . \"\\\\)\"))))) + ((eq paren \\='words) \\='(\"\\\\\\=<\\\\(\" . \"\\\\)\\\\>\")) + ((eq paren \\='symbols) \\='(\"\\\\_<\\\\(\" . \"\\\\)\\\\_>\")) + ((null paren) \\='(\"\\\\(?:\" . \"\\\\)\")) + (t \\='(\"\\\\(\" . \"\\\\)\"))))) (concat (car paren) - (mapconcat 'regexp-quote strings \"\\\\|\") + (mapconcat \\='regexp-quote strings \"\\\\|\") (cdr paren))))" (save-match-data ;; Recurse on the sorted list. |