summaryrefslogtreecommitdiff
path: root/lisp/misearch.el
diff options
context:
space:
mode:
authorJuri Linkov <juri@jurta.org>2013-12-11 02:11:26 +0200
committerJuri Linkov <juri@jurta.org>2013-12-11 02:11:26 +0200
commit4cc51eaf0931af5cb17b9b84b97a61612455e818 (patch)
tree7db77a5a7464c5dc9d895f7638ff948843557004 /lisp/misearch.el
parentceac12b73183b3f90804373d5ac5c45c0165e4f9 (diff)
downloademacs-4cc51eaf0931af5cb17b9b84b97a61612455e818.tar.gz
* lisp/misearch.el (multi-isearch-buffers): Set the value of
`multi-isearch-buffer-list' globally. Set NO-RECURSIVE-EDIT arg of isearch-forward to t. (multi-isearch-buffers-regexp): Set the value of `multi-isearch-buffer-list' globally. Set NO-RECURSIVE-EDIT arg of isearch-forward-regexp to t. (multi-isearch-files): Set the value of `multi-isearch-file-list' globally. Set NO-RECURSIVE-EDIT arg of isearch-forward to t. (multi-isearch-files-regexp): Set the value of `multi-isearch-file-list globally. Set NO-RECURSIVE-EDIT arg of isearch-forward-regexp to t. * lisp/dired-aux.el (dired-isearch-filenames): Set NO-RECURSIVE-EDIT arg of isearch-forward to t. (dired-isearch-filenames-regexp): Set NO-RECURSIVE-EDIT arg of isearch-forward-regexp to t. (dired-isearch-filter-filenames): Remove unnecessary check for `dired-isearch-filenames'. * lisp/comint.el (comint-history-isearch-backward): Set NO-RECURSIVE-EDIT arg of isearch-backward to t. (comint-history-isearch-backward-regexp): Set NO-RECURSIVE-EDIT arg of isearch-backward-regexp to t. Fixes: debbugs:16035
Diffstat (limited to 'lisp/misearch.el')
-rw-r--r--lisp/misearch.el24
1 files changed, 12 insertions, 12 deletions
diff --git a/lisp/misearch.el b/lisp/misearch.el
index 0c4cd4ea323..36b826b862a 100644
--- a/lisp/misearch.el
+++ b/lisp/misearch.el
@@ -262,11 +262,11 @@ whose names match the specified regexp."
(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)
@@ -280,11 +280,11 @@ whose names match the specified regexp."
(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)))
;;; Global multi-file search invocations
@@ -346,11 +346,11 @@ whose file names match the specified wildcard."
(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)
@@ -365,11 +365,11 @@ whose file names match the specified wildcard."
(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)))
(provide 'multi-isearch)