From: Mattias EngdegÄrd Date: Sun, 13 Aug 2023 08:36:21 +0000 (+0200) Subject: ; * lisp/emacs-lisp/rx.el: slight modernisation of internal rx usage X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=163e7dac5f2f9e1154ee5ae76fee9e4602a9b7cb;p=emacs.git ; * lisp/emacs-lisp/rx.el: slight modernisation of internal rx usage --- diff --git a/lisp/emacs-lisp/rx.el b/lisp/emacs-lisp/rx.el index aa1174ea08b..afc9826eefa 100644 --- a/lisp/emacs-lisp/rx.el +++ b/lisp/emacs-lisp/rx.el @@ -26,7 +26,7 @@ ;; The translation to string regexp is done by a macro and does not ;; incur any extra processing during run time. Example: ;; -;; (rx bos (or (not (any "^")) +;; (rx bos (or (not "^") ;; (seq "^" (or " *" "[")))) ;; ;; => "\\`\\(?:[^^]\\|\\^\\(?: \\*\\|\\[\\)\\)" @@ -616,7 +616,7 @@ classes." ;; Empty set (or any char). ((and (null intervals) (null classes)) (if negated - (rx--translate-symbol 'anything) + (rx--translate-symbol 'anychar) (rx--empty))) ;; More than one character, or at least one class. @@ -1095,15 +1095,15 @@ Return (REGEXP . PRECEDENCE)." (opt "^") (opt "]") (* (or (seq "[:" (+ (any "a-z")) ":]") - (not (any "]")))) + (not "]"))) "]") (not (any "*+?^$[\\")) (seq "\\" - (or anything - (seq (any "sScC_") anything) + (or anychar + (seq (any "sScC_") anychar) (seq "(" - (* (or (not (any "\\")) - (seq "\\" (not (any ")"))))) + (* (or (not "\\") + (seq "\\" (not ")")))) "\\)")))) eos) t)))