[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Emacs-diffs] emacs-25 cef6c89: More accurate documentation of lax white
From: |
Eli Zaretskii |
Subject: |
[Emacs-diffs] emacs-25 cef6c89: More accurate documentation of lax whitespace matching |
Date: |
Tue, 01 Dec 2015 19:30:15 +0000 |
branch: emacs-25
commit cef6c89175cd93be94a412ceb1b1e38381d209b8
Author: Eli Zaretskii <address@hidden>
Commit: Eli Zaretskii <address@hidden>
More accurate documentation of lax whitespace matching
* lisp/isearch.el (isearch-forward-word, isearch-forward-symbol)
(word-search-backward, word-search-forward)
(word-search-backward-lax, word-search-forward-lax): Mention in
doc strings that toggling lax whitespace matching has no effect on
these commands.
* doc/emacs/search.texi (Word Search, Symbol Search): Clarify that
lax whitespace matching has no effect on these commands.
---
doc/emacs/search.texi | 10 ++++++----
lisp/isearch.el | 18 ++++++++++++------
2 files changed, 18 insertions(+), 10 deletions(-)
diff --git a/doc/emacs/search.texi b/doc/emacs/search.texi
index 81b4f87..d377dda 100644
--- a/doc/emacs/search.texi
+++ b/doc/emacs/search.texi
@@ -610,8 +610,9 @@ so that the matching can proceed incrementally as you type.
This
additional laxity does not apply to the lazy highlight
(@pxref{Incremental Search}), which always matches whole words.
- The word search commands don't perform character folding and cannot
-support lax whitespace matching (@pxref{Lax Search}).
+ The word search commands don't perform character folding, and
+toggling lax whitespace matching (@pxref{Lax Search, lax space
+matching}) has no effect on them.
@kindex M-s M-w
@findex eww-search-word
@@ -669,8 +670,9 @@ search. In nonincremental symbol searches, the beginning
and end of
the search string are required to match the beginning and end of a
symbol, respectively.
- The symbol search commands don't perform character folding and
-cannot support lax whitespace matching (@pxref{Lax Search}).
+ The symbol search commands don't perform character folding, and
+toggling lax whitespace matching (@pxref{Lax Search, lax space
+matching}) has no effect on them.
@node Regexp Search
@section Regular Expression Search
diff --git a/lisp/isearch.el b/lisp/isearch.el
index 229121d..8c98d36 100644
--- a/lisp/isearch.el
+++ b/lisp/isearch.el
@@ -785,7 +785,8 @@ With a prefix argument, do a regular string search instead.
Like ordinary incremental search except that your input is treated
as a sequence of words without regard to how the words are separated.
See the command `isearch-forward' for more information.
-This command does not support character folding or lax space matching."
+This command does not support character folding, and lax space matching
+has no effect on it."
(interactive "P\np")
(isearch-mode t nil nil (not no-recursive-edit) (null not-word)))
@@ -795,7 +796,8 @@ The prefix argument is currently unused.
Like ordinary incremental search except that your input is treated
as a symbol surrounded by symbol boundary constructs \\_< and \\_>.
See the command `isearch-forward' for more information.
-This command does not support character folding or lax space matching."
+This command does not support character folding, and lax space matching
+has no effect on it."
(interactive "P\np")
(isearch-mode t nil nil (not no-recursive-edit) 'isearch-symbol-regexp))
@@ -1625,7 +1627,8 @@ Optional fourth argument is repeat count--search for
successive occurrences.
Relies on the function `word-search-regexp' to convert a sequence
of words in STRING to a regexp used to search words without regard
to punctuation.
-This command does not support character folding or lax space matching."
+This command does not support character folding, and lax space matching
+has no effect on it."
(interactive "sWord search backward: ")
(re-search-backward (word-search-regexp string nil) bound noerror count))
@@ -1641,7 +1644,8 @@ Optional fourth argument is repeat count--search for
successive occurrences.
Relies on the function `word-search-regexp' to convert a sequence
of words in STRING to a regexp used to search words without regard
to punctuation.
-This command does not support character folding or lax space matching."
+This command does not support character folding, and lax space matching
+has no effect on it."
(interactive "sWord search: ")
(re-search-forward (word-search-regexp string nil) bound noerror count))
@@ -1661,7 +1665,8 @@ Optional fourth argument is repeat count--search for
successive occurrences.
Relies on the function `word-search-regexp' to convert a sequence
of words in STRING to a regexp used to search words without regard
to punctuation.
-This command does not support character folding or lax space matching."
+This command does not support character folding, and lax space matching
+has no effect on it."
(interactive "sWord search backward: ")
(re-search-backward (word-search-regexp string t) bound noerror count))
@@ -1681,7 +1686,8 @@ Optional fourth argument is repeat count--search for
successive occurrences.
Relies on the function `word-search-regexp' to convert a sequence
of words in STRING to a regexp used to search words without regard
to punctuation.
-This command does not support character folding or lax space matching."
+This command does not support character folding, and lax space matching
+has no effect on it."
(interactive "sWord search: ")
(re-search-forward (word-search-regexp string t) bound noerror count))
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Emacs-diffs] emacs-25 cef6c89: More accurate documentation of lax whitespace matching,
Eli Zaretskii <=