diff options
| author | Stefan Kangas <stefankangas@gmail.com> | 2022-12-20 11:43:30 +0100 |
|---|---|---|
| committer | Stefan Kangas <stefankangas@gmail.com> | 2022-12-20 12:00:38 +0100 |
| commit | 8d6fb6498ab457e92b08e26203b585ba989a7844 (patch) | |
| tree | c0fc87e870acae5892c89e912fc68ebb9834805d /lisp/emacs-lisp | |
| parent | f47419766d219b043ed368c062e40dc78e41ed6e (diff) | |
| download | emacs-8d6fb6498ab457e92b08e26203b585ba989a7844.tar.gz emacs-8d6fb6498ab457e92b08e26203b585ba989a7844.tar.bz2 emacs-8d6fb6498ab457e92b08e26203b585ba989a7844.zip | |
; Revert UK->US spelling fix in rx.el
* lisp/emacs-lisp/rx.el (rx--normalise-or-arg): Revert to British
spelling of internal symbol.
Diffstat (limited to 'lisp/emacs-lisp')
| -rw-r--r-- | lisp/emacs-lisp/rx.el | 13 |
1 files changed, 5 insertions, 8 deletions
diff --git a/lisp/emacs-lisp/rx.el b/lisp/emacs-lisp/rx.el index 2ebdbc0efc4..f2a0dc54832 100644 --- a/lisp/emacs-lisp/rx.el +++ b/lisp/emacs-lisp/rx.el @@ -254,20 +254,20 @@ Left-fold the list L, starting with X, by the binary function F." (setq l (cdr l))) x) -(defun rx--normalize-or-arg (form) +(defun rx--normalise-or-arg (form) "Normalize the `or' argument FORM. Characters become strings, user-definitions and `eval' forms are expanded, and `or' forms are normalized recursively." (cond ((characterp form) (char-to-string form)) ((and (consp form) (memq (car form) '(or |))) - (cons (car form) (mapcar #'rx--normalize-or-arg (cdr form)))) + (cons (car form) (mapcar #'rx--normalise-or-arg (cdr form)))) ((and (consp form) (eq (car form) 'eval)) - (rx--normalize-or-arg (rx--expand-eval (cdr form)))) + (rx--normalise-or-arg (rx--expand-eval (cdr form)))) (t (let ((expanded (rx--expand-def form))) (if expanded - (rx--normalize-or-arg expanded) + (rx--normalise-or-arg expanded) form))))) (defun rx--all-string-or-args (body) @@ -302,7 +302,7 @@ Return (REGEXP . PRECEDENCE)." ((null (cdr body)) ; Single item. (rx--translate (car body))) (t - (let* ((args (mapcar #'rx--normalize-or-arg body)) + (let* ((args (mapcar #'rx--normalise-or-arg body)) (all-strings (catch 'rx--nonstring (rx--all-string-or-args args)))) (cond (all-strings ; Only strings. @@ -1494,9 +1494,6 @@ following constructs: ;; Obsolete internal symbol, used in old versions of the `flycheck' package. (define-obsolete-function-alias 'rx-submatch-n 'rx-to-string "27.1") -(define-obsolete-function-alias 'rx--normalise-or-arg - #'rx--normalize-or-arg "30.1") - (provide 'rx) ;;; rx.el ends here |