[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Emacs-diffs] trunk r115449: * lisp/misearch.el (multi-isearch-buffers):
From: |
Juri Linkov |
Subject: |
[Emacs-diffs] trunk r115449: * lisp/misearch.el (multi-isearch-buffers): Set the value of |
Date: |
Wed, 11 Dec 2013 00:11:42 +0000 |
User-agent: |
Bazaar (2.6b2) |
------------------------------------------------------------
revno: 115449
revision-id: address@hidden
parent: address@hidden
fixes bug: http://debbugs.gnu.org/16035
committer: Juri Linkov <address@hidden>
branch nick: trunk
timestamp: Wed 2013-12-11 02:11:26 +0200
message:
* 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.
modified:
lisp/ChangeLog changelog-20091113204419-o5vbwnq5f7feedwu-1432
lisp/comint.el comint.el-20091113204419-o5vbwnq5f7feedwu-149
lisp/dired-aux.el diredaux.el-20091113204419-o5vbwnq5f7feedwu-484
lisp/dired.el dired.el-20091113204419-o5vbwnq5f7feedwu-482
lisp/misearch.el
misearch.el-20091113204419-o5vbwnq5f7feedwu-8754
=== modified file 'lisp/ChangeLog'
--- a/lisp/ChangeLog 2013-12-10 20:56:59 +0000
+++ b/lisp/ChangeLog 2013-12-11 00:11:26 +0000
@@ -1,3 +1,30 @@
+2013-12-11 Juri Linkov <address@hidden>
+
+ * 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 <address@hidden>
* Makefile.in (autoloads): Run $(srcdir)/loaddefs.el through
=== modified file 'lisp/comint.el'
--- a/lisp/comint.el 2013-11-30 08:42:28 +0000
+++ b/lisp/comint.el 2013-12-11 00:11:26 +0000
@@ -1407,13 +1407,13 @@
"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)
=== modified file 'lisp/dired-aux.el'
--- a/lisp/dired-aux.el 2013-08-10 15:17:29 +0000
+++ b/lisp/dired-aux.el 2013-12-11 00:11:26 +0000
@@ -2526,24 +2526,22 @@
"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.
=== modified file 'lisp/dired.el'
--- a/lisp/dired.el 2013-10-30 16:29:36 +0000
+++ b/lisp/dired.el 2013-12-11 00:11:26 +0000
@@ -3849,7 +3849,7 @@
;;; 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" "\
=== modified file 'lisp/misearch.el'
--- a/lisp/misearch.el 2013-01-11 23:08:55 +0000
+++ b/lisp/misearch.el 2013-12-11 00:11:26 +0000
@@ -262,11 +262,11 @@
(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 @@
(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 @@
(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 @@
(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)
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Emacs-diffs] trunk r115449: * lisp/misearch.el (multi-isearch-buffers): Set the value of,
Juri Linkov <=