;;; misearch.el --- isearch extensions for multi-buffer search
-;; Copyright (C) 2007-2014 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
+ "Sequence of buffers visited by multiple buffers Isearch.
+This is nil if Isearch is not currently searching more than one buffer.")
+;;;###autoload
+(defvar multi-isearch-file-list nil
+ "Sequence of files visited by multiple file buffers Isearch.")
+
(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
(ido-ignore-item-temp-list bufs))
(while (not (string-equal
(setq buf (read-buffer
- (if (eq read-buffer-function 'ido-read-buffer)
+ (if (eq read-buffer-function #'ido-read-buffer)
"Next buffer to search (C-j to end): "
"Next buffer to search (RET to end): ")
nil t))
(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
\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
(goto-char (if isearch-forward (point-min) (point-max)))
(isearch-forward-regexp nil t)))
+(defvar unload-function-defs-list)
+
+(defun multi-isearch-unload-function ()
+ "Remove autoloaded variables from `unload-function-defs-list'.
+Also prevent the feature from being reloaded via `isearch-mode-hook'."
+ (remove-hook 'isearch-mode-hook 'multi-isearch-setup)
+ (let ((defs (list (car unload-function-defs-list)))
+ (auto '(multi-isearch-next-buffer-function
+ multi-isearch-next-buffer-current-function
+ multi-isearch-current-buffer
+ multi-isearch-buffer-list multi-isearch-file-list)))
+ (dolist (def (cdr unload-function-defs-list))
+ (unless (and (symbolp def)
+ (memq def auto))
+ (push def defs)))
+ (setq unload-function-defs-list (nreverse defs))
+ ;; .
+ nil))
+
+(defalias 'misearch-unload-function 'multi-isearch-unload-function)
+
\f
(provide 'multi-isearch)
(provide 'misearch)