summaryrefslogtreecommitdiff
path: root/lisp/emacs-lisp
diff options
context:
space:
mode:
authorGlenn Morris <rgm@gnu.org>2020-08-18 07:51:05 -0700
committerGlenn Morris <rgm@gnu.org>2020-08-18 07:51:05 -0700
commit013ddd1e5dcea1515e849eb9dea5b9c864407bd0 (patch)
tree28be516a3d2c8a18f03a5911e2d6501810a1b5fc /lisp/emacs-lisp
parent23e6c36645bb8f07f55ba94af21cebaaab2c91d3 (diff)
parentcf0ee6f49b4b0b03db2c3f9fe93e1a486472e831 (diff)
downloademacs-013ddd1e5dcea1515e849eb9dea5b9c864407bd0.tar.gz
emacs-013ddd1e5dcea1515e849eb9dea5b9c864407bd0.tar.bz2
emacs-013ddd1e5dcea1515e849eb9dea5b9c864407bd0.zip
Merge from origin/emacs-27
cf0ee6f49b ; spelling fixes 16f4f26632 Fix startup working dir bug on NeXTSTEP
Diffstat (limited to 'lisp/emacs-lisp')
-rw-r--r--lisp/emacs-lisp/rx.el4
1 files changed, 2 insertions, 2 deletions
diff --git a/lisp/emacs-lisp/rx.el b/lisp/emacs-lisp/rx.el
index 88bb0a8bd6c..8d8d071031c 100644
--- a/lisp/emacs-lisp/rx.el
+++ b/lisp/emacs-lisp/rx.el
@@ -255,9 +255,9 @@ Left-fold the list L, starting with X, by the binary function F."
x)
(defun rx--normalise-or-arg (form)
- "Normalise the `or' argument FORM.
+ "Normalize the `or' argument FORM.
Characters become strings, user-definitions and `eval' forms are expanded,
-and `or' forms are normalised recursively."
+and `or' forms are normalized recursively."
(cond ((characterp form)
(char-to-string form))
((and (consp form) (memq (car form) '(or |)))