diff options
| author | Glenn Morris <rgm@gnu.org> | 2020-01-20 07:50:26 -0800 |
|---|---|---|
| committer | Glenn Morris <rgm@gnu.org> | 2020-01-20 07:50:26 -0800 |
| commit | 519de2f88e3f9985f41a763953711b63a8223628 (patch) | |
| tree | db5a2f2bea7a9531ea736d100142f9cc434ea4fb /lisp/emacs-lisp | |
| parent | cdede988b48802c5f2ccce2d38bebcdc4c7dbb05 (diff) | |
| parent | f3d30b5303783a307921b914d4df0b082106b39d (diff) | |
| download | emacs-519de2f88e3f9985f41a763953711b63a8223628.tar.gz emacs-519de2f88e3f9985f41a763953711b63a8223628.tar.bz2 emacs-519de2f88e3f9985f41a763953711b63a8223628.zip | |
Merge from origin/emacs-27
f3d30b5303 Remove some doc references to old Emacs versions
4217bc229b Fix infloop in shell.el
74b151195d Fix erc-notifications-notify for non-PRIVMSGs, broken in l...
db4436eaf9 Fix the notification action for PRIVMSG in erc-notificatio...
36a4068105 ERC: New maintainer.
2391d3f45d ; spelling fixes
e898442be3 Honor tags-case-fold-search during xref identifer completion
# Conflicts:
# etc/NEWS
Diffstat (limited to 'lisp/emacs-lisp')
| -rw-r--r-- | lisp/emacs-lisp/rx.el | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/lisp/emacs-lisp/rx.el b/lisp/emacs-lisp/rx.el index dbce0795954..03af053c91e 100644 --- a/lisp/emacs-lisp/rx.el +++ b/lisp/emacs-lisp/rx.el @@ -273,7 +273,7 @@ Return (REGEXP . PRECEDENCE)." ;; (or (+ digit) "CHARLIE" "CHAN" (+ blank)) ;; -> (or (+ digit) (or "CHARLIE" "CHAN") (+ blank)) ;; - ;; - Optimise single-character alternatives better: + ;; - Optimize single-character alternatives better: ;; * classes: space, alpha, ... ;; * (syntax S), for some S (whitespace, word) ;; so that (or "@" "%" digit (any "A-Z" space) (syntax word)) |