mirror of
git://git.sv.gnu.org/emacs.git
synced 2025-12-15 10:30:25 -08:00
* 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
This commit is contained in:
parent
ceac12b731
commit
4cc51eaf09
5 changed files with 46 additions and 21 deletions
|
|
@ -1,3 +1,30 @@
|
|||
2013-12-11 Juri Linkov <juri@jurta.org>
|
||||
|
||||
* 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. (Bug#16035)
|
||||
|
||||
* 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'.
|
||||
|
||||
* 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.
|
||||
|
||||
2013-12-10 Eli Zaretskii <eliz@gnu.org>
|
||||
|
||||
* Makefile.in (autoloads): Run $(srcdir)/loaddefs.el through
|
||||
|
|
|
|||
|
|
@ -1407,13 +1407,13 @@ If nil, Isearch operates on the whole comint buffer."
|
|||
"Search for a string backward in input history using Isearch."
|
||||
(interactive)
|
||||
(let ((comint-history-isearch t))
|
||||
(isearch-backward)))
|
||||
(isearch-backward nil t)))
|
||||
|
||||
(defun comint-history-isearch-backward-regexp ()
|
||||
"Search for a regular expression backward in input history using Isearch."
|
||||
(interactive)
|
||||
(let ((comint-history-isearch t))
|
||||
(isearch-backward-regexp)))
|
||||
(isearch-backward-regexp nil t)))
|
||||
|
||||
(defvar-local comint-history-isearch-message-overlay nil)
|
||||
|
||||
|
|
|
|||
|
|
@ -2526,24 +2526,22 @@ Intended to be added to `isearch-mode-hook'."
|
|||
"Test whether the current search hit is a file name.
|
||||
Return non-nil if the text from BEG to END is part of a file
|
||||
name (has the text property `dired-filename')."
|
||||
(if dired-isearch-filenames
|
||||
(text-property-not-all (min beg end) (max beg end)
|
||||
'dired-filename nil)
|
||||
t))
|
||||
(text-property-not-all (min beg end) (max beg end)
|
||||
'dired-filename nil))
|
||||
|
||||
;;;###autoload
|
||||
(defun dired-isearch-filenames ()
|
||||
"Search for a string using Isearch only in file names in the Dired buffer."
|
||||
(interactive)
|
||||
(let ((dired-isearch-filenames t))
|
||||
(isearch-forward)))
|
||||
(isearch-forward nil t)))
|
||||
|
||||
;;;###autoload
|
||||
(defun dired-isearch-filenames-regexp ()
|
||||
"Search for a regexp using Isearch only in file names in the Dired buffer."
|
||||
(interactive)
|
||||
(let ((dired-isearch-filenames t))
|
||||
(isearch-forward-regexp)))
|
||||
(isearch-forward-regexp nil t)))
|
||||
|
||||
|
||||
;; Functions for searching in tags style among marked files.
|
||||
|
|
|
|||
|
|
@ -3849,7 +3849,7 @@ Ask means pop up a menu for the user to select one of copy, move or link."
|
|||
|
||||
;;; Start of automatically extracted autoloads.
|
||||
|
||||
;;;### (autoloads nil "dired-aux" "dired-aux.el" "04b4cb6bde3220f55574eb1d99ac0d29")
|
||||
;;;### (autoloads nil "dired-aux" "dired-aux.el" "4cb9d594789dacdf2445f338b9189357")
|
||||
;;; Generated autoloads from dired-aux.el
|
||||
|
||||
(autoload 'dired-diff "dired-aux" "\
|
||||
|
|
|
|||
|
|
@ -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)
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue