diff options
| author | Stefan Kangas <stefan@marxist.se> | 2022-07-14 11:37:42 +0200 |
|---|---|---|
| committer | Stefan Kangas <stefan@marxist.se> | 2022-07-14 11:37:42 +0200 |
| commit | 4e79f77635a80e0c25841ba15feb0e70c8824516 (patch) | |
| tree | 7f68cf7d809a10e6c2501fb3d9451047fb8da051 /doc/lispref/searching.texi | |
| parent | e1d93302c29916e738552484b9363c5b9e77c5c1 (diff) | |
| parent | 5e47ec95118c06dd66cd488ad25775d801d75c0c (diff) | |
| download | emacs-4e79f77635a80e0c25841ba15feb0e70c8824516.tar.gz emacs-4e79f77635a80e0c25841ba15feb0e70c8824516.tar.bz2 emacs-4e79f77635a80e0c25841ba15feb0e70c8824516.zip | |
Merge from origin/emacs-28
5e47ec9511 ; * lisp/url/url-http.el (url-http-parse-headers): Fix typo.
ba0871bef1 ; Fix typos: prefer American spelling
e3e7f31faa Adapt Tramp doc
# Conflicts:
# etc/NEWS
# etc/themes/modus-themes.el
# lisp/emacs-lisp/byte-opt.el
# test/lisp/so-long-tests/spelling-tests.el
Diffstat (limited to 'doc/lispref/searching.texi')
| -rw-r--r-- | doc/lispref/searching.texi | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/doc/lispref/searching.texi b/doc/lispref/searching.texi index 21a2c6c51e4..5ee139a11d3 100644 --- a/doc/lispref/searching.texi +++ b/doc/lispref/searching.texi @@ -1898,7 +1898,7 @@ attempts. Other zero-width assertions may also bring benefits by causing a match to fail early. @item -Avoid or-patterns in favour of character alternatives: write +Avoid or-patterns in favor of character alternatives: write @samp{[ab]} instead of @samp{a\|b}. Recall that @samp{\s-} and @samp{\sw} are equivalent to @samp{[[:space:]]} and @samp{[[:word:]]}, respectively. @@ -1933,7 +1933,7 @@ purposes. @ifnottex @item -Consider using @code{rx} (@pxref{Rx Notation}); it can optimise some +Consider using @code{rx} (@pxref{Rx Notation}); it can optimize some or-patterns automatically and will never introduce capturing groups unless explicitly requested. @end ifnottex |