diff options
| author | Glenn Morris | 2014-02-20 00:14:20 -0800 |
|---|---|---|
| committer | Glenn Morris | 2014-02-20 00:14:20 -0800 |
| commit | 4d49cc6547d9215da503bd84aadf946e8f2582be (patch) | |
| tree | bc52a1a04f4ed38bd4b3f0069f1d7847a48ebf0d | |
| parent | 189e70077d1c088d4892a1377da2c4da156867b3 (diff) | |
| download | emacs-4d49cc6547d9215da503bd84aadf946e8f2582be.tar.gz emacs-4d49cc6547d9215da503bd84aadf946e8f2582be.zip | |
Some doc for search-invisible
* doc/emacs/search.texi (Special Isearch): Mention invisible text.
* lisp/isearch.el (search-invisible): Doc fix.
* etc/NEWS: Related edit.
| -rw-r--r-- | doc/emacs/ChangeLog | 4 | ||||
| -rw-r--r-- | doc/emacs/search.texi | 13 | ||||
| -rw-r--r-- | etc/NEWS | 4 | ||||
| -rw-r--r-- | lisp/ChangeLog | 4 | ||||
| -rw-r--r-- | lisp/isearch.el | 6 |
5 files changed, 28 insertions, 3 deletions
diff --git a/doc/emacs/ChangeLog b/doc/emacs/ChangeLog index c16920d38df..6255f85ff09 100644 --- a/doc/emacs/ChangeLog +++ b/doc/emacs/ChangeLog | |||
| @@ -1,3 +1,7 @@ | |||
| 1 | 2014-02-20 Glenn Morris <rgm@gnu.org> | ||
| 2 | |||
| 3 | * search.texi (Special Isearch): Mention invisible text. | ||
| 4 | |||
| 1 | 2014-02-18 Glenn Morris <rgm@gnu.org> | 5 | 2014-02-18 Glenn Morris <rgm@gnu.org> |
| 2 | 6 | ||
| 3 | * trouble.texi (Contributing) [WWW_GNU_ORG]: Link to | 7 | * trouble.texi (Contributing) [WWW_GNU_ORG]: Link to |
diff --git a/doc/emacs/search.texi b/doc/emacs/search.texi index 35aa15ee163..057811ac55c 100644 --- a/doc/emacs/search.texi +++ b/doc/emacs/search.texi | |||
| @@ -244,6 +244,18 @@ in the search string, the search becomes case-sensitive. If you | |||
| 244 | delete the upper-case character from the search string, it ceases to | 244 | delete the upper-case character from the search string, it ceases to |
| 245 | have this effect. @xref{Search Case}. | 245 | have this effect. @xref{Search Case}. |
| 246 | 246 | ||
| 247 | @cindex invisible text, searching for | ||
| 248 | @kindex M-s i @r{(Incremental search)} | ||
| 249 | @findex isearch-toggle-invisible | ||
| 250 | @vindex search-invisible | ||
| 251 | Some Emacs modes hide certain text by making it invisible. For | ||
| 252 | example, Outline major mode (@pxref{Outline Mode}). By default, | ||
| 253 | incremental search will search for matches in text hidden by Outline | ||
| 254 | mode (and some other modes), and make the text visible if it finds a match. | ||
| 255 | To toggle whether or not invisible text is searched, type | ||
| 256 | @kbd{M-s i} (@code{isearch-toggle-invisible}). To change the default | ||
| 257 | for future searches, customize the option @code{search-invisible}. | ||
| 258 | |||
| 247 | To search for a newline character, type @kbd{C-j}. | 259 | To search for a newline character, type @kbd{C-j}. |
| 248 | 260 | ||
| 249 | To search for non-@acronym{ASCII} characters, use one of the | 261 | To search for non-@acronym{ASCII} characters, use one of the |
| @@ -1047,6 +1059,7 @@ This variable applies to nonincremental searches also, including those | |||
| 1047 | performed by the replace commands (@pxref{Replace}) and the minibuffer | 1059 | performed by the replace commands (@pxref{Replace}) and the minibuffer |
| 1048 | history matching commands (@pxref{Minibuffer History}). | 1060 | history matching commands (@pxref{Minibuffer History}). |
| 1049 | 1061 | ||
| 1062 | @c isearch-toggle-case-fold | ||
| 1050 | Typing @kbd{M-c} within an incremental search toggles the case | 1063 | Typing @kbd{M-c} within an incremental search toggles the case |
| 1051 | sensitivity of that search. The effect does not extend beyond the | 1064 | sensitivity of that search. The effect does not extend beyond the |
| 1052 | current incremental search to the next one, but it does override the | 1065 | current incremental search to the next one, but it does override the |
| @@ -766,9 +766,7 @@ symbol found near point added to the search string initially. | |||
| 766 | *** `C-x 8 RET' in Isearch mode reads a character by its Unicode name | 766 | *** `C-x 8 RET' in Isearch mode reads a character by its Unicode name |
| 767 | and adds it to the search string. | 767 | and adds it to the search string. |
| 768 | 768 | ||
| 769 | *** `M-s i' in Isearch mode toggles the variable `isearch-invisible' | 769 | *** `M-s i' in Isearch mode toggles whether search matches invisible text. |
| 770 | between nil and the value of the option `search-invisible' (or `open' | ||
| 771 | when it's nil). | ||
| 772 | 770 | ||
| 773 | *** `query-replace' skips invisible text when `search-invisible' is nil, | 771 | *** `query-replace' skips invisible text when `search-invisible' is nil, |
| 774 | and opens overlays with hidden text when `search-invisible' is `open'. | 772 | and opens overlays with hidden text when `search-invisible' is `open'. |
diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 833c089f107..9b6b370c452 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog | |||
| @@ -1,3 +1,7 @@ | |||
| 1 | 2014-02-20 Glenn Morris <rgm@gnu.org> | ||
| 2 | |||
| 3 | * isearch.el (search-invisible): Doc fix. | ||
| 4 | |||
| 1 | 2014-02-20 W. Trevor King <wking@tremily.us> (tiny change) | 5 | 2014-02-20 W. Trevor King <wking@tremily.us> (tiny change) |
| 2 | 6 | ||
| 3 | * term/xterm.el (xterm--version-handler): Adapt to xterm-280's output | 7 | * term/xterm.el (xterm--version-handler): Adapt to xterm-280's output |
diff --git a/lisp/isearch.el b/lisp/isearch.el index e4611c29f65..a158c96c06d 100644 --- a/lisp/isearch.el +++ b/lisp/isearch.el | |||
| @@ -137,6 +137,12 @@ When the value is `open', if the text matched is made invisible by | |||
| 137 | an overlay having an `invisible' property and that overlay has a property | 137 | an overlay having an `invisible' property and that overlay has a property |
| 138 | `isearch-open-invisible', then incremental search will show the contents. | 138 | `isearch-open-invisible', then incremental search will show the contents. |
| 139 | \(This applies when using `outline.el' and `hideshow.el'.) | 139 | \(This applies when using `outline.el' and `hideshow.el'.) |
| 140 | |||
| 141 | To temporarily change the value for an active incremental search, | ||
| 142 | use \\<isearch-mode-map>\\[isearch-toggle-invisible]. | ||
| 143 | |||
| 144 | See also the related option `isearch-hide-immediately'. | ||
| 145 | |||
| 140 | See also `reveal-mode' if you want overlays to automatically be opened | 146 | See also `reveal-mode' if you want overlays to automatically be opened |
| 141 | whenever point is in one of them." | 147 | whenever point is in one of them." |
| 142 | :type '(choice (const :tag "Match hidden text" t) | 148 | :type '(choice (const :tag "Match hidden text" t) |