annotate lisp/isearch-multi.el @ 86003:e33327200372

* emacs-lisp/byte-opt.el (byte-optimize-featurep): Optimize (featurep 'emacs) to t. * emacs-lisp/bytecomp.el (byte-compile-find-bound-condition): New function. (byte-compile-maybe-guarded): Use it to also look for bound symbols inside `and' forms. Comment out non-working code that was trying to avoid warnings for XEmacs code.
author Dan Nicolaescu <dann@ics.uci.edu>
date Sat, 10 Nov 2007 08:05:15 +0000
parents 4516d805659c
children f4816ef45bcb
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
85568
76aa2c1e4934 New file.
Juri Linkov <juri@jurta.org>
parents:
diff changeset
1 ;;; isearch-multi.el --- isearch extensions for multi-buffer search
76aa2c1e4934 New file.
Juri Linkov <juri@jurta.org>
parents:
diff changeset
2
76aa2c1e4934 New file.
Juri Linkov <juri@jurta.org>
parents:
diff changeset
3 ;; Copyright (C) 2007 Free Software Foundation, Inc.
76aa2c1e4934 New file.
Juri Linkov <juri@jurta.org>
parents:
diff changeset
4
76aa2c1e4934 New file.
Juri Linkov <juri@jurta.org>
parents:
diff changeset
5 ;; Author: Juri Linkov <juri@jurta.org>
76aa2c1e4934 New file.
Juri Linkov <juri@jurta.org>
parents:
diff changeset
6 ;; Keywords: matching
76aa2c1e4934 New file.
Juri Linkov <juri@jurta.org>
parents:
diff changeset
7
76aa2c1e4934 New file.
Juri Linkov <juri@jurta.org>
parents:
diff changeset
8 ;; This file is part of GNU Emacs.
76aa2c1e4934 New file.
Juri Linkov <juri@jurta.org>
parents:
diff changeset
9
76aa2c1e4934 New file.
Juri Linkov <juri@jurta.org>
parents:
diff changeset
10 ;; GNU Emacs is free software; you can redistribute it and/or modify
76aa2c1e4934 New file.
Juri Linkov <juri@jurta.org>
parents:
diff changeset
11 ;; it under the terms of the GNU General Public License as published by
76aa2c1e4934 New file.
Juri Linkov <juri@jurta.org>
parents:
diff changeset
12 ;; the Free Software Foundation; either version 3, or (at your option)
76aa2c1e4934 New file.
Juri Linkov <juri@jurta.org>
parents:
diff changeset
13 ;; any later version.
76aa2c1e4934 New file.
Juri Linkov <juri@jurta.org>
parents:
diff changeset
14
76aa2c1e4934 New file.
Juri Linkov <juri@jurta.org>
parents:
diff changeset
15 ;; GNU Emacs is distributed in the hope that it will be useful,
76aa2c1e4934 New file.
Juri Linkov <juri@jurta.org>
parents:
diff changeset
16 ;; but WITHOUT ANY WARRANTY; without even the implied warranty of
76aa2c1e4934 New file.
Juri Linkov <juri@jurta.org>
parents:
diff changeset
17 ;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
76aa2c1e4934 New file.
Juri Linkov <juri@jurta.org>
parents:
diff changeset
18 ;; GNU General Public License for more details.
76aa2c1e4934 New file.
Juri Linkov <juri@jurta.org>
parents:
diff changeset
19
76aa2c1e4934 New file.
Juri Linkov <juri@jurta.org>
parents:
diff changeset
20 ;; You should have received a copy of the GNU General Public License
76aa2c1e4934 New file.
Juri Linkov <juri@jurta.org>
parents:
diff changeset
21 ;; along with GNU Emacs; see the file COPYING. If not, write to the
76aa2c1e4934 New file.
Juri Linkov <juri@jurta.org>
parents:
diff changeset
22 ;; Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
76aa2c1e4934 New file.
Juri Linkov <juri@jurta.org>
parents:
diff changeset
23 ;; Boston, MA 02110-1301, USA.
76aa2c1e4934 New file.
Juri Linkov <juri@jurta.org>
parents:
diff changeset
24
76aa2c1e4934 New file.
Juri Linkov <juri@jurta.org>
parents:
diff changeset
25 ;;; Commentary:
76aa2c1e4934 New file.
Juri Linkov <juri@jurta.org>
parents:
diff changeset
26
76aa2c1e4934 New file.
Juri Linkov <juri@jurta.org>
parents:
diff changeset
27 ;; This file adds more dimensions to the search space. It implements
76aa2c1e4934 New file.
Juri Linkov <juri@jurta.org>
parents:
diff changeset
28 ;; various features that extend isearch. One of them is an ability to
76aa2c1e4934 New file.
Juri Linkov <juri@jurta.org>
parents:
diff changeset
29 ;; search through multiple buffers.
76aa2c1e4934 New file.
Juri Linkov <juri@jurta.org>
parents:
diff changeset
30
76aa2c1e4934 New file.
Juri Linkov <juri@jurta.org>
parents:
diff changeset
31 ;;; Code:
76aa2c1e4934 New file.
Juri Linkov <juri@jurta.org>
parents:
diff changeset
32
76aa2c1e4934 New file.
Juri Linkov <juri@jurta.org>
parents:
diff changeset
33 ;;; Search multiple buffers
76aa2c1e4934 New file.
Juri Linkov <juri@jurta.org>
parents:
diff changeset
34
76aa2c1e4934 New file.
Juri Linkov <juri@jurta.org>
parents:
diff changeset
35 (defgroup isearch-buffers nil
76aa2c1e4934 New file.
Juri Linkov <juri@jurta.org>
parents:
diff changeset
36 "Using isearch to search through multiple buffers."
76aa2c1e4934 New file.
Juri Linkov <juri@jurta.org>
parents:
diff changeset
37 :version "23.1"
76aa2c1e4934 New file.
Juri Linkov <juri@jurta.org>
parents:
diff changeset
38 :group 'isearch)
76aa2c1e4934 New file.
Juri Linkov <juri@jurta.org>
parents:
diff changeset
39
85667
4516d805659c (isearch-buffers-multi): New option.
Richard M. Stallman <rms@gnu.org>
parents: 85604
diff changeset
40 (defcustom isearch-buffers-multi t
4516d805659c (isearch-buffers-multi): New option.
Richard M. Stallman <rms@gnu.org>
parents: 85604
diff changeset
41 "Non-nil enables searching multiple related buffers, in certain modes."
4516d805659c (isearch-buffers-multi): New option.
Richard M. Stallman <rms@gnu.org>
parents: 85604
diff changeset
42 :type 'boolean
4516d805659c (isearch-buffers-multi): New option.
Richard M. Stallman <rms@gnu.org>
parents: 85604
diff changeset
43 :version "23.1"
4516d805659c (isearch-buffers-multi): New option.
Richard M. Stallman <rms@gnu.org>
parents: 85604
diff changeset
44 :group 'isearch-buffers)
4516d805659c (isearch-buffers-multi): New option.
Richard M. Stallman <rms@gnu.org>
parents: 85604
diff changeset
45
85568
76aa2c1e4934 New file.
Juri Linkov <juri@jurta.org>
parents:
diff changeset
46 (defcustom isearch-buffers-pause t
76aa2c1e4934 New file.
Juri Linkov <juri@jurta.org>
parents:
diff changeset
47 "A choice defining where to pause the search.
76aa2c1e4934 New file.
Juri Linkov <juri@jurta.org>
parents:
diff changeset
48 If the value is nil, don't pause before going to the next buffer.
76aa2c1e4934 New file.
Juri Linkov <juri@jurta.org>
parents:
diff changeset
49 If the value is `initial', pause only after a failing search in the
76aa2c1e4934 New file.
Juri Linkov <juri@jurta.org>
parents:
diff changeset
50 initial buffer.
76aa2c1e4934 New file.
Juri Linkov <juri@jurta.org>
parents:
diff changeset
51 If t, pause in all buffers that contain the search string."
76aa2c1e4934 New file.
Juri Linkov <juri@jurta.org>
parents:
diff changeset
52 :type '(choice
76aa2c1e4934 New file.
Juri Linkov <juri@jurta.org>
parents:
diff changeset
53 (const :tag "Don't pause" nil)
76aa2c1e4934 New file.
Juri Linkov <juri@jurta.org>
parents:
diff changeset
54 (const :tag "Only in initial buffer" initial)
76aa2c1e4934 New file.
Juri Linkov <juri@jurta.org>
parents:
diff changeset
55 (const :tag "All buffers" t))
76aa2c1e4934 New file.
Juri Linkov <juri@jurta.org>
parents:
diff changeset
56 :version "23.1"
76aa2c1e4934 New file.
Juri Linkov <juri@jurta.org>
parents:
diff changeset
57 :group 'isearch-buffers)
76aa2c1e4934 New file.
Juri Linkov <juri@jurta.org>
parents:
diff changeset
58
76aa2c1e4934 New file.
Juri Linkov <juri@jurta.org>
parents:
diff changeset
59 ;;;###autoload
76aa2c1e4934 New file.
Juri Linkov <juri@jurta.org>
parents:
diff changeset
60 (defvar isearch-buffers-current-buffer nil
76aa2c1e4934 New file.
Juri Linkov <juri@jurta.org>
parents:
diff changeset
61 "The buffer where the search is currently searching.
76aa2c1e4934 New file.
Juri Linkov <juri@jurta.org>
parents:
diff changeset
62 The value is nil when the search still is in the initial buffer.")
76aa2c1e4934 New file.
Juri Linkov <juri@jurta.org>
parents:
diff changeset
63
76aa2c1e4934 New file.
Juri Linkov <juri@jurta.org>
parents:
diff changeset
64 ;;;###autoload
76aa2c1e4934 New file.
Juri Linkov <juri@jurta.org>
parents:
diff changeset
65 (defvar isearch-buffers-next-buffer-function nil
76aa2c1e4934 New file.
Juri Linkov <juri@jurta.org>
parents:
diff changeset
66 "Function to call to get the next buffer to search.
76aa2c1e4934 New file.
Juri Linkov <juri@jurta.org>
parents:
diff changeset
67
76aa2c1e4934 New file.
Juri Linkov <juri@jurta.org>
parents:
diff changeset
68 When this variable is set to a function that returns a buffer, then
76aa2c1e4934 New file.
Juri Linkov <juri@jurta.org>
parents:
diff changeset
69 after typing another C-s or C-r at a failing search, the search goes
76aa2c1e4934 New file.
Juri Linkov <juri@jurta.org>
parents:
diff changeset
70 to the next buffer in the series and continues searching for the
76aa2c1e4934 New file.
Juri Linkov <juri@jurta.org>
parents:
diff changeset
71 next occurrence.
76aa2c1e4934 New file.
Juri Linkov <juri@jurta.org>
parents:
diff changeset
72
76aa2c1e4934 New file.
Juri Linkov <juri@jurta.org>
parents:
diff changeset
73 The first argument of this function is the current buffer where the
76aa2c1e4934 New file.
Juri Linkov <juri@jurta.org>
parents:
diff changeset
74 search is currently searching. It defines the base buffer relative to
76aa2c1e4934 New file.
Juri Linkov <juri@jurta.org>
parents:
diff changeset
75 which this function should find the next buffer. When the isearch
76aa2c1e4934 New file.
Juri Linkov <juri@jurta.org>
parents:
diff changeset
76 direction is backward (when isearch-forward is nil), this function
76aa2c1e4934 New file.
Juri Linkov <juri@jurta.org>
parents:
diff changeset
77 should return the previous buffer to search. If the second argument of
76aa2c1e4934 New file.
Juri Linkov <juri@jurta.org>
parents:
diff changeset
78 this function WRAP is non-nil, then it should return the first buffer
76aa2c1e4934 New file.
Juri Linkov <juri@jurta.org>
parents:
diff changeset
79 in the series; and for the backward search, it should return the last
76aa2c1e4934 New file.
Juri Linkov <juri@jurta.org>
parents:
diff changeset
80 buffer in the series.")
76aa2c1e4934 New file.
Juri Linkov <juri@jurta.org>
parents:
diff changeset
81
76aa2c1e4934 New file.
Juri Linkov <juri@jurta.org>
parents:
diff changeset
82 ;;;###autoload
76aa2c1e4934 New file.
Juri Linkov <juri@jurta.org>
parents:
diff changeset
83 (define-minor-mode isearch-buffers-minor-mode
76aa2c1e4934 New file.
Juri Linkov <juri@jurta.org>
parents:
diff changeset
84 "Minor mode for using isearch to search through multiple buffers.
76aa2c1e4934 New file.
Juri Linkov <juri@jurta.org>
parents:
diff changeset
85 With arg, turn isearch-buffers minor mode on if arg is positive, off otherwise."
76aa2c1e4934 New file.
Juri Linkov <juri@jurta.org>
parents:
diff changeset
86 :group 'isearch-buffers ;; :lighter " X"
76aa2c1e4934 New file.
Juri Linkov <juri@jurta.org>
parents:
diff changeset
87 (if isearch-buffers-minor-mode
76aa2c1e4934 New file.
Juri Linkov <juri@jurta.org>
parents:
diff changeset
88 (progn
76aa2c1e4934 New file.
Juri Linkov <juri@jurta.org>
parents:
diff changeset
89 (add-hook 'isearch-mode-hook 'isearch-buffers-init nil t)
76aa2c1e4934 New file.
Juri Linkov <juri@jurta.org>
parents:
diff changeset
90 (set (make-local-variable 'isearch-search-fun-function)
76aa2c1e4934 New file.
Juri Linkov <juri@jurta.org>
parents:
diff changeset
91 'isearch-buffers-search-fun)
76aa2c1e4934 New file.
Juri Linkov <juri@jurta.org>
parents:
diff changeset
92 (set (make-local-variable 'isearch-wrap-function)
76aa2c1e4934 New file.
Juri Linkov <juri@jurta.org>
parents:
diff changeset
93 'isearch-buffers-wrap)
76aa2c1e4934 New file.
Juri Linkov <juri@jurta.org>
parents:
diff changeset
94 (set (make-local-variable 'isearch-push-state-function)
76aa2c1e4934 New file.
Juri Linkov <juri@jurta.org>
parents:
diff changeset
95 'isearch-buffers-push-state))
76aa2c1e4934 New file.
Juri Linkov <juri@jurta.org>
parents:
diff changeset
96 (remove-hook 'isearch-mode-hook 'isearch-buffers-init t)
76aa2c1e4934 New file.
Juri Linkov <juri@jurta.org>
parents:
diff changeset
97 (kill-local-variable 'isearch-search-fun-function)
76aa2c1e4934 New file.
Juri Linkov <juri@jurta.org>
parents:
diff changeset
98 (kill-local-variable 'isearch-wrap-function)
76aa2c1e4934 New file.
Juri Linkov <juri@jurta.org>
parents:
diff changeset
99 (kill-local-variable 'isearch-push-state-function)))
76aa2c1e4934 New file.
Juri Linkov <juri@jurta.org>
parents:
diff changeset
100
76aa2c1e4934 New file.
Juri Linkov <juri@jurta.org>
parents:
diff changeset
101 (defun isearch-buffers-init ()
76aa2c1e4934 New file.
Juri Linkov <juri@jurta.org>
parents:
diff changeset
102 "Set up isearch to search multiple buffers.
76aa2c1e4934 New file.
Juri Linkov <juri@jurta.org>
parents:
diff changeset
103 Intended to be added to `isearch-mode-hook'."
76aa2c1e4934 New file.
Juri Linkov <juri@jurta.org>
parents:
diff changeset
104 (setq isearch-buffers-current-buffer nil))
76aa2c1e4934 New file.
Juri Linkov <juri@jurta.org>
parents:
diff changeset
105
76aa2c1e4934 New file.
Juri Linkov <juri@jurta.org>
parents:
diff changeset
106 (defun isearch-buffers-search-fun ()
76aa2c1e4934 New file.
Juri Linkov <juri@jurta.org>
parents:
diff changeset
107 "Return the proper search function, for isearch in multiple buffers."
76aa2c1e4934 New file.
Juri Linkov <juri@jurta.org>
parents:
diff changeset
108 (lambda (string bound noerror)
76aa2c1e4934 New file.
Juri Linkov <juri@jurta.org>
parents:
diff changeset
109 (let ((search-fun
76aa2c1e4934 New file.
Juri Linkov <juri@jurta.org>
parents:
diff changeset
110 ;; Use standard functions to search within one buffer
76aa2c1e4934 New file.
Juri Linkov <juri@jurta.org>
parents:
diff changeset
111 (cond
76aa2c1e4934 New file.
Juri Linkov <juri@jurta.org>
parents:
diff changeset
112 (isearch-word
76aa2c1e4934 New file.
Juri Linkov <juri@jurta.org>
parents:
diff changeset
113 (if isearch-forward 'word-search-forward 'word-search-backward))
76aa2c1e4934 New file.
Juri Linkov <juri@jurta.org>
parents:
diff changeset
114 (isearch-regexp
76aa2c1e4934 New file.
Juri Linkov <juri@jurta.org>
parents:
diff changeset
115 (if isearch-forward 're-search-forward 're-search-backward))
76aa2c1e4934 New file.
Juri Linkov <juri@jurta.org>
parents:
diff changeset
116 (t
76aa2c1e4934 New file.
Juri Linkov <juri@jurta.org>
parents:
diff changeset
117 (if isearch-forward 'search-forward 'search-backward))))
76aa2c1e4934 New file.
Juri Linkov <juri@jurta.org>
parents:
diff changeset
118 found buffer)
76aa2c1e4934 New file.
Juri Linkov <juri@jurta.org>
parents:
diff changeset
119 (or
76aa2c1e4934 New file.
Juri Linkov <juri@jurta.org>
parents:
diff changeset
120 ;; 1. First try searching in the initial buffer
76aa2c1e4934 New file.
Juri Linkov <juri@jurta.org>
parents:
diff changeset
121 (let ((res (funcall search-fun string bound noerror)))
76aa2c1e4934 New file.
Juri Linkov <juri@jurta.org>
parents:
diff changeset
122 ;; Reset wrapping for all-buffers pause after successful search
76aa2c1e4934 New file.
Juri Linkov <juri@jurta.org>
parents:
diff changeset
123 (if (and res (eq isearch-buffers-pause t))
76aa2c1e4934 New file.
Juri Linkov <juri@jurta.org>
parents:
diff changeset
124 (setq isearch-buffers-current-buffer nil))
76aa2c1e4934 New file.
Juri Linkov <juri@jurta.org>
parents:
diff changeset
125 res)
76aa2c1e4934 New file.
Juri Linkov <juri@jurta.org>
parents:
diff changeset
126 ;; 2. If the above search fails, start visiting next/prev buffers
76aa2c1e4934 New file.
Juri Linkov <juri@jurta.org>
parents:
diff changeset
127 ;; successively, and search the string in them. Do this only
76aa2c1e4934 New file.
Juri Linkov <juri@jurta.org>
parents:
diff changeset
128 ;; when bound is nil (i.e. not while lazy-highlighting search
76aa2c1e4934 New file.
Juri Linkov <juri@jurta.org>
parents:
diff changeset
129 ;; strings in the current buffer).
85667
4516d805659c (isearch-buffers-multi): New option.
Richard M. Stallman <rms@gnu.org>
parents: 85604
diff changeset
130 (when (and (not bound) isearch-buffers-multi)
85568
76aa2c1e4934 New file.
Juri Linkov <juri@jurta.org>
parents:
diff changeset
131 ;; If no-pause or there was one attempt to leave the current buffer
76aa2c1e4934 New file.
Juri Linkov <juri@jurta.org>
parents:
diff changeset
132 (if (or (null isearch-buffers-pause)
76aa2c1e4934 New file.
Juri Linkov <juri@jurta.org>
parents:
diff changeset
133 (and isearch-buffers-pause isearch-buffers-current-buffer))
76aa2c1e4934 New file.
Juri Linkov <juri@jurta.org>
parents:
diff changeset
134 (condition-case nil
76aa2c1e4934 New file.
Juri Linkov <juri@jurta.org>
parents:
diff changeset
135 (progn
76aa2c1e4934 New file.
Juri Linkov <juri@jurta.org>
parents:
diff changeset
136 (while (not found)
76aa2c1e4934 New file.
Juri Linkov <juri@jurta.org>
parents:
diff changeset
137 ;; Find the next buffer to search
76aa2c1e4934 New file.
Juri Linkov <juri@jurta.org>
parents:
diff changeset
138 (setq buffer (funcall isearch-buffers-next-buffer-function
76aa2c1e4934 New file.
Juri Linkov <juri@jurta.org>
parents:
diff changeset
139 buffer))
76aa2c1e4934 New file.
Juri Linkov <juri@jurta.org>
parents:
diff changeset
140 (with-current-buffer buffer
76aa2c1e4934 New file.
Juri Linkov <juri@jurta.org>
parents:
diff changeset
141 (goto-char (if isearch-forward (point-min) (point-max)))
76aa2c1e4934 New file.
Juri Linkov <juri@jurta.org>
parents:
diff changeset
142 (setq isearch-barrier (point) isearch-opoint (point))
76aa2c1e4934 New file.
Juri Linkov <juri@jurta.org>
parents:
diff changeset
143 ;; After visiting the next/prev buffer search the
76aa2c1e4934 New file.
Juri Linkov <juri@jurta.org>
parents:
diff changeset
144 ;; string in it again, until the function in
76aa2c1e4934 New file.
Juri Linkov <juri@jurta.org>
parents:
diff changeset
145 ;; isearch-buffers-next-buffer-function raises an error
76aa2c1e4934 New file.
Juri Linkov <juri@jurta.org>
parents:
diff changeset
146 ;; at the beginning/end of the buffer sequence.
76aa2c1e4934 New file.
Juri Linkov <juri@jurta.org>
parents:
diff changeset
147 (setq found (funcall search-fun string bound noerror))))
76aa2c1e4934 New file.
Juri Linkov <juri@jurta.org>
parents:
diff changeset
148 ;; Set buffer for isearch-search-string to switch
76aa2c1e4934 New file.
Juri Linkov <juri@jurta.org>
parents:
diff changeset
149 (if buffer (setq isearch-buffers-current-buffer buffer))
76aa2c1e4934 New file.
Juri Linkov <juri@jurta.org>
parents:
diff changeset
150 ;; Return point of the new search result
76aa2c1e4934 New file.
Juri Linkov <juri@jurta.org>
parents:
diff changeset
151 found)
76aa2c1e4934 New file.
Juri Linkov <juri@jurta.org>
parents:
diff changeset
152 ;; Return nil when isearch-buffers-next-buffer-function fails
76aa2c1e4934 New file.
Juri Linkov <juri@jurta.org>
parents:
diff changeset
153 (error nil))
76aa2c1e4934 New file.
Juri Linkov <juri@jurta.org>
parents:
diff changeset
154 (signal 'search-failed (list string "Repeat for next buffer"))))))))
76aa2c1e4934 New file.
Juri Linkov <juri@jurta.org>
parents:
diff changeset
155
76aa2c1e4934 New file.
Juri Linkov <juri@jurta.org>
parents:
diff changeset
156 (defun isearch-buffers-wrap ()
76aa2c1e4934 New file.
Juri Linkov <juri@jurta.org>
parents:
diff changeset
157 "Wrap the multiple buffers search when search is failed.
76aa2c1e4934 New file.
Juri Linkov <juri@jurta.org>
parents:
diff changeset
158 Switch buffer to the first buffer for a forward search,
76aa2c1e4934 New file.
Juri Linkov <juri@jurta.org>
parents:
diff changeset
159 or to the last buffer for a backward search.
76aa2c1e4934 New file.
Juri Linkov <juri@jurta.org>
parents:
diff changeset
160 Set `isearch-buffers-current-buffer' to the current buffer to display
76aa2c1e4934 New file.
Juri Linkov <juri@jurta.org>
parents:
diff changeset
161 the isearch suffix message [initial buffer] only when isearch leaves
76aa2c1e4934 New file.
Juri Linkov <juri@jurta.org>
parents:
diff changeset
162 the initial buffer."
76aa2c1e4934 New file.
Juri Linkov <juri@jurta.org>
parents:
diff changeset
163 (if (or (null isearch-buffers-pause)
76aa2c1e4934 New file.
Juri Linkov <juri@jurta.org>
parents:
diff changeset
164 (and isearch-buffers-pause isearch-buffers-current-buffer))
76aa2c1e4934 New file.
Juri Linkov <juri@jurta.org>
parents:
diff changeset
165 (progn
76aa2c1e4934 New file.
Juri Linkov <juri@jurta.org>
parents:
diff changeset
166 (switch-to-buffer
76aa2c1e4934 New file.
Juri Linkov <juri@jurta.org>
parents:
diff changeset
167 (setq isearch-buffers-current-buffer
76aa2c1e4934 New file.
Juri Linkov <juri@jurta.org>
parents:
diff changeset
168 (funcall isearch-buffers-next-buffer-function
76aa2c1e4934 New file.
Juri Linkov <juri@jurta.org>
parents:
diff changeset
169 (current-buffer) t)))
76aa2c1e4934 New file.
Juri Linkov <juri@jurta.org>
parents:
diff changeset
170 (goto-char (if isearch-forward (point-min) (point-max))))
76aa2c1e4934 New file.
Juri Linkov <juri@jurta.org>
parents:
diff changeset
171 (setq isearch-buffers-current-buffer (current-buffer))
76aa2c1e4934 New file.
Juri Linkov <juri@jurta.org>
parents:
diff changeset
172 (setq isearch-wrapped nil)))
76aa2c1e4934 New file.
Juri Linkov <juri@jurta.org>
parents:
diff changeset
173
76aa2c1e4934 New file.
Juri Linkov <juri@jurta.org>
parents:
diff changeset
174 (defun isearch-buffers-push-state ()
76aa2c1e4934 New file.
Juri Linkov <juri@jurta.org>
parents:
diff changeset
175 "Save a function restoring the state of multiple buffers search.
76aa2c1e4934 New file.
Juri Linkov <juri@jurta.org>
parents:
diff changeset
176 Save the current buffer to the additional state parameter in the
76aa2c1e4934 New file.
Juri Linkov <juri@jurta.org>
parents:
diff changeset
177 search status stack."
76aa2c1e4934 New file.
Juri Linkov <juri@jurta.org>
parents:
diff changeset
178 `(lambda (cmd)
76aa2c1e4934 New file.
Juri Linkov <juri@jurta.org>
parents:
diff changeset
179 (isearch-buffers-pop-state cmd ,(current-buffer))))
76aa2c1e4934 New file.
Juri Linkov <juri@jurta.org>
parents:
diff changeset
180
76aa2c1e4934 New file.
Juri Linkov <juri@jurta.org>
parents:
diff changeset
181 (defun isearch-buffers-pop-state (cmd buffer)
76aa2c1e4934 New file.
Juri Linkov <juri@jurta.org>
parents:
diff changeset
182 "Restore the multiple buffers search state.
76aa2c1e4934 New file.
Juri Linkov <juri@jurta.org>
parents:
diff changeset
183 Switch to the buffer restored from the search status stack."
76aa2c1e4934 New file.
Juri Linkov <juri@jurta.org>
parents:
diff changeset
184 (unless (equal buffer (current-buffer))
76aa2c1e4934 New file.
Juri Linkov <juri@jurta.org>
parents:
diff changeset
185 (switch-to-buffer (setq isearch-buffers-current-buffer buffer))))
76aa2c1e4934 New file.
Juri Linkov <juri@jurta.org>
parents:
diff changeset
186
76aa2c1e4934 New file.
Juri Linkov <juri@jurta.org>
parents:
diff changeset
187 (provide 'isearch-multi)
85604
14c6e96eeaad Add arch tagline
Miles Bader <miles@gnu.org>
parents: 85568
diff changeset
188
14c6e96eeaad Add arch tagline
Miles Bader <miles@gnu.org>
parents: 85568
diff changeset
189 ;; arch-tag: a6d38ffa-4d14-4e39-8ac6-46af9d6a6773
85568
76aa2c1e4934 New file.
Juri Linkov <juri@jurta.org>
parents:
diff changeset
190 ;;; isearch-multi.el ends here