diff options
| author | Juri Linkov <juri@jurta.org> | 2014-11-09 21:19:54 +0200 |
|---|---|---|
| committer | Juri Linkov <juri@jurta.org> | 2014-11-09 21:19:54 +0200 |
| commit | d3dba954b3fbbbad3d858756999752328ab6cee6 (patch) | |
| tree | 135d4fa1d11ada7e2b43f04d89899574f1561604 /lisp/misearch.el | |
| parent | 6f7716e8c74beb69adfe7af000facda8297c1cc7 (diff) | |
| download | emacs-d3dba954b3fbbbad3d858756999752328ab6cee6.tar.gz | |
* 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 'lisp/misearch.el')
| -rw-r--r-- | lisp/misearch.el | 13 |
1 files changed, 8 insertions, 5 deletions
diff --git a/lisp/misearch.el b/lisp/misearch.el index 64ea40b7a1d..4b003b9b19d 100644 --- a/lisp/misearch.el +++ b/lisp/misearch.el @@ -91,6 +91,11 @@ Isearch starts.") "The buffer where the search is currently searching. The value is nil when the search still is in the initial buffer.") +;;;###autoload +(defvar multi-isearch-buffer-list nil) +;;;###autoload +(defvar multi-isearch-file-list nil) + (defvar multi-isearch-orig-search-fun nil) (defvar multi-isearch-orig-wrap nil) (defvar multi-isearch-orig-push-state nil) @@ -119,7 +124,9 @@ Intended to be added to `isearch-mode-hook'." (defun multi-isearch-end () "Clean up the multi-buffer search after terminating isearch." (setq multi-isearch-current-buffer nil - multi-isearch-next-buffer-current-function nil) + multi-isearch-next-buffer-current-function nil + multi-isearch-buffer-list nil + multi-isearch-file-list nil) (setq-default isearch-search-fun-function multi-isearch-orig-search-fun isearch-wrap-function multi-isearch-orig-wrap isearch-push-state-function multi-isearch-orig-push-state) @@ -204,8 +211,6 @@ Switch to the buffer restored from the search status stack." ;;; Global multi-buffer search invocations -(defvar multi-isearch-buffer-list nil) - (defun multi-isearch-next-buffer-from-list (&optional buffer wrap) "Return the next buffer in the series of buffers. This function is used for multiple buffers Isearch. A sequence of @@ -290,8 +295,6 @@ whose names match the specified regexp." ;;; Global multi-file search invocations -(defvar multi-isearch-file-list nil) - (defun multi-isearch-next-file-buffer-from-list (&optional buffer wrap) "Return the next buffer in the series of file buffers. This function is used for multiple file buffers Isearch. A sequence |