diff options
| author | Eli Zaretskii | 2019-03-07 16:19:00 +0200 |
|---|---|---|
| committer | Eli Zaretskii | 2019-03-07 16:19:00 +0200 |
| commit | 953cbce77be9a8da1cbf0ca5ee6442923478e186 (patch) | |
| tree | 578ee0cc4c4314df07913d5b790ab89ab50a123b /doc | |
| parent | a0b2a5ad9ec8186b679ee80e1c5b9786672344a0 (diff) | |
| parent | 3fd2100bff58008b1eaf48922539d914c6ce6c16 (diff) | |
| download | emacs-953cbce77be9a8da1cbf0ca5ee6442923478e186.tar.gz emacs-953cbce77be9a8da1cbf0ca5ee6442923478e186.zip | |
Merge branch 'master' of git.savannah.gnu.org:/srv/git/emacs
Diffstat (limited to 'doc')
| -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 38e62040550..740be2a31ff 100644 --- a/doc/lispref/searching.texi +++ b/doc/lispref/searching.texi | |||
| @@ -950,7 +950,7 @@ whitespace: | |||
| 950 | @end defun | 950 | @end defun |
| 951 | 951 | ||
| 952 | @cindex optimize regexp | 952 | @cindex optimize regexp |
| 953 | @defun regexp-opt strings &optional paren noreorder | 953 | @defun regexp-opt strings &optional paren keep-order |
| 954 | This function returns an efficient regular expression that will match | 954 | This function returns an efficient regular expression that will match |
| 955 | any of the strings in the list @var{strings}. This is useful when you | 955 | any of the strings in the list @var{strings}. This is useful when you |
| 956 | need to make matching or searching as fast as possible---for example, | 956 | need to make matching or searching as fast as possible---for example, |
| @@ -988,7 +988,7 @@ if it is necessary to ensure that a postfix operator appended to | |||
| 988 | it will apply to the whole expression. | 988 | it will apply to the whole expression. |
| 989 | @end table | 989 | @end table |
| 990 | 990 | ||
| 991 | The optional argument @var{noreorder}, if @code{nil} or omitted, | 991 | The optional argument @var{keep-order}, if @code{nil} or omitted, |
| 992 | allows the returned regexp to match the strings in any order. If | 992 | allows the returned regexp to match the strings in any order. If |
| 993 | non-@code{nil}, the match is guaranteed to be performed in the order | 993 | non-@code{nil}, the match is guaranteed to be performed in the order |
| 994 | given, as if the strings were made into a regexp by joining them with | 994 | given, as if the strings were made into a regexp by joining them with |