;;; misearch.el --- isearch extensions for multi-buffer search
-;; Copyright (C) 2007-2013 Free Software Foundation, Inc.
+;; Copyright (C) 2007-2015 Free Software Foundation, Inc.
;; Author: Juri Linkov <juri@jurta.org>
;; Keywords: matching
"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)
(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)
\f
;;; 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
(nreverse bufs)))
(defun multi-isearch-read-matching-buffers ()
- "Return a list of buffers whose names match specified regexp."
+ "Return a list of buffers whose names match specified regexp.
+Uses `read-regexp' to read the regexp."
;; Most code from `multi-occur-in-matching-buffers'
;; and `kill-matching-buffers'.
(let ((bufregexp
(multi-isearch-read-matching-buffers)
(multi-isearch-read-buffers))))
(let ((multi-isearch-next-buffer-function
- 'multi-isearch-next-buffer-from-list)
- (multi-isearch-buffer-list (mapcar #'get-buffer buffers)))
+ 'multi-isearch-next-buffer-from-list))
+ (setq multi-isearch-buffer-list (mapcar #'get-buffer buffers))
(switch-to-buffer (car multi-isearch-buffer-list))
(goto-char (if isearch-forward (point-min) (point-max)))
- (isearch-forward)))
+ (isearch-forward nil t)))
;;;###autoload
(defun multi-isearch-buffers-regexp (buffers)
(multi-isearch-read-matching-buffers)
(multi-isearch-read-buffers))))
(let ((multi-isearch-next-buffer-function
- 'multi-isearch-next-buffer-from-list)
- (multi-isearch-buffer-list (mapcar #'get-buffer buffers)))
+ 'multi-isearch-next-buffer-from-list))
+ (setq multi-isearch-buffer-list (mapcar #'get-buffer buffers))
(switch-to-buffer (car multi-isearch-buffer-list))
(goto-char (if isearch-forward (point-min) (point-max)))
- (isearch-forward-regexp)))
+ (isearch-forward-regexp nil t)))
\f
;;; 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
(add-to-list 'files file))
(nreverse files)))
+;; A regexp is not the same thing as a file glob - does this matter?
(defun multi-isearch-read-matching-files ()
- "Return a list of files whose names match specified wildcard."
+ "Return a list of files whose names match specified wildcard.
+Uses `read-regexp' to read the wildcard."
;; Most wildcard code from `find-file-noselect'.
(let ((filename (read-regexp "Search in files whose names match wildcard")))
(when (and filename
(multi-isearch-read-matching-files)
(multi-isearch-read-files))))
(let ((multi-isearch-next-buffer-function
- 'multi-isearch-next-file-buffer-from-list)
- (multi-isearch-file-list (mapcar #'expand-file-name files)))
+ 'multi-isearch-next-file-buffer-from-list))
+ (setq multi-isearch-file-list (mapcar #'expand-file-name files))
(find-file (car multi-isearch-file-list))
(goto-char (if isearch-forward (point-min) (point-max)))
- (isearch-forward)))
+ (isearch-forward nil t)))
;;;###autoload
(defun multi-isearch-files-regexp (files)
(multi-isearch-read-matching-files)
(multi-isearch-read-files))))
(let ((multi-isearch-next-buffer-function
- 'multi-isearch-next-file-buffer-from-list)
- (multi-isearch-file-list (mapcar #'expand-file-name files)))
+ 'multi-isearch-next-file-buffer-from-list))
+ (setq multi-isearch-file-list (mapcar #'expand-file-name files))
(find-file (car multi-isearch-file-list))
(goto-char (if isearch-forward (point-min) (point-max)))
- (isearch-forward-regexp)))
+ (isearch-forward-regexp nil t)))
\f
(provide 'multi-isearch)