diff options
| author | Juri Linkov | 2014-11-09 21:19:54 +0200 |
|---|---|---|
| committer | Juri Linkov | 2014-11-09 21:19:54 +0200 |
| commit | d3dba954b3fbbbad3d858756999752328ab6cee6 (patch) | |
| tree | 135d4fa1d11ada7e2b43f04d89899574f1561604 /doc | |
| parent | 6f7716e8c74beb69adfe7af000facda8297c1cc7 (diff) | |
| download | emacs-d3dba954b3fbbbad3d858756999752328ab6cee6.tar.gz emacs-d3dba954b3fbbbad3d858756999752328ab6cee6.zip | |
* lisp/isearch.el (isearch-message-prefix): Show "Multi-file" and
"Multi-buffer" instead of "Multi".
* lisp/misearch.el (multi-isearch-file-list): Autoload
multi-isearch-buffer-list and multi-isearch-file-list.
(multi-isearch-end): Reset multi-isearch-buffer-list and
multi-isearch-file-list to nil.
* doc/emacs/search.texi (Other Repeating Search): Add documentation for
multi-isearch-files and multi-isearch-files-regexp.
Fixes: debbugs:13592
Diffstat (limited to 'doc')
| -rw-r--r-- | doc/emacs/ChangeLog | 5 | ||||
| -rw-r--r-- | doc/emacs/search.texi | 16 |
2 files changed, 21 insertions, 0 deletions
diff --git a/doc/emacs/ChangeLog b/doc/emacs/ChangeLog index 8e85c890285..0ca6af0e648 100644 --- a/doc/emacs/ChangeLog +++ b/doc/emacs/ChangeLog | |||
| @@ -1,3 +1,8 @@ | |||
| 1 | 2014-11-09 Juri Linkov <juri@jurta.org> | ||
| 2 | |||
| 3 | * search.texi (Other Repeating Search): Add documentation for | ||
| 4 | multi-isearch-files and multi-isearch-files-regexp. (Bug#13592) | ||
| 5 | |||
| 1 | 2014-11-09 Glenn Morris <rgm@gnu.org> | 6 | 2014-11-09 Glenn Morris <rgm@gnu.org> |
| 2 | 7 | ||
| 3 | * Makefile.in (version): Remove variable. | 8 | * Makefile.in (version): Remove variable. |
diff --git a/doc/emacs/search.texi b/doc/emacs/search.texi index bd0bd0bf641..a0c59c6f87f 100644 --- a/doc/emacs/search.texi +++ b/doc/emacs/search.texi | |||
| @@ -1436,6 +1436,22 @@ matching that regexp. | |||
| 1436 | This command is just like @code{multi-isearch-buffers}, except it | 1436 | This command is just like @code{multi-isearch-buffers}, except it |
| 1437 | performs an incremental regexp search. | 1437 | performs an incremental regexp search. |
| 1438 | 1438 | ||
| 1439 | @item M-x multi-isearch-files | ||
| 1440 | Prompt for one or more file names, ending with @key{RET}; then, | ||
| 1441 | begin a multi-file incremental search in those files. (If the | ||
| 1442 | search fails in one file, the next @kbd{C-s} tries searching the | ||
| 1443 | next specified file, and so forth.) With a prefix argument, prompt | ||
| 1444 | for a regexp and begin a multi-file incremental search in files | ||
| 1445 | matching that regexp. | ||
| 1446 | |||
| 1447 | @item M-x multi-isearch-files-regexp | ||
| 1448 | This command is just like @code{multi-isearch-files}, except it | ||
| 1449 | performs an incremental regexp search. | ||
| 1450 | |||
| 1451 | In some modes that set the buffer-local variable | ||
| 1452 | @code{multi-isearch-next-buffer-function} (e.g., in Change Log mode) | ||
| 1453 | a multi-file incremental search is activated automatically. | ||
| 1454 | |||
| 1439 | @cindex Occur mode | 1455 | @cindex Occur mode |
| 1440 | @cindex mode, Occur | 1456 | @cindex mode, Occur |
| 1441 | @item M-x occur | 1457 | @item M-x occur |