diff options
| author | Glenn Morris <rgm@gnu.org> | 2020-02-13 07:50:30 -0800 |
|---|---|---|
| committer | Glenn Morris <rgm@gnu.org> | 2020-02-13 07:50:30 -0800 |
| commit | a13d1f953980b516470d03ab23250760c581c05b (patch) | |
| tree | b65338d7378342801134c038cb04f5b13bb3c275 /test/lisp/emacs-lisp/rx-tests.el | |
| parent | 70d62e0cd131eb1d6e039af447e48a049096854b (diff) | |
| parent | 0304f530761bee1c217bbf8fe7839cdfe8767a51 (diff) | |
| download | emacs-a13d1f953980b516470d03ab23250760c581c05b.tar.gz emacs-a13d1f953980b516470d03ab23250760c581c05b.tar.bz2 emacs-a13d1f953980b516470d03ab23250760c581c05b.zip | |
Merge from origin/emacs-27
0304f53076 (origin/emacs-27) doc/misc/org.texi: Fix @dircategory
027da652a4 Fix display of minibuffer prompt in ido.el
5a21aaff46 rx: Use longest match for all-string 'or' forms (bug#37659)
2b12c2b6f2 Make sure not to mark directories
ff4ed4a0ff ; Add a TODO
3a5129a1c9 vc-hg-dir-status-files: Fix when DIR is not repository root
# Conflicts:
# etc/NEWS
Diffstat (limited to 'test/lisp/emacs-lisp/rx-tests.el')
| -rw-r--r-- | test/lisp/emacs-lisp/rx-tests.el | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/test/lisp/emacs-lisp/rx-tests.el b/test/lisp/emacs-lisp/rx-tests.el index e19e626527b..a6c172adfe7 100644 --- a/test/lisp/emacs-lisp/rx-tests.el +++ b/test/lisp/emacs-lisp/rx-tests.el @@ -43,7 +43,7 @@ (should (equal (rx (or "ab" (| "c" nonl) "de")) "ab\\|c\\|.\\|de")) (should (equal (rx (or "ab" "abc" "a")) - "\\(?:ab\\|abc\\|a\\)")) + "\\(?:a\\(?:bc?\\)?\\)")) (should (equal (rx (| nonl "a") (| "b" blank)) "\\(?:.\\|a\\)\\(?:b\\|[[:blank:]]\\)")) (should (equal (rx (|)) |