From: Juri Linkov <juri@jurta.org>
Date: Tue, 11 Nov 2008 20:14:38 +0000 (+0000)
Subject: (dired-isearch-filenames)
X-Git-Tag: emacs-pretest-23.0.90~1880
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=978d723ed975bf68d4187f39d8ffd1fd99b70a89;p=emacs.git

(dired-isearch-filenames)
(dired-isearch-filenames-regexp):
Let-bind isearch-message-prefix-add to "filename ".
---

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 7fba1983f9c..935fa82b10d 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,36 @@
+2008-11-11  Juri Linkov  <juri@jurta.org>
+
+	* dired-aux.el (dired-isearch-filenames)
+	(dired-isearch-filenames-regexp):
+	Let-bind isearch-message-prefix-add to "filename ".
+
+	* isearch.el (isearch-message-prefix-add)
+	(isearch-message-suffix-add): New variables.
+	(isearch-message-prefix): Show additional text from
+	`isearch-message-prefix-add' before "I-search".
+	(isearch-message-suffix): Show additional text from
+	`isearch-message-suffix-add' at the end.
+
+	* isearch.el (isearch-lazy-highlight-search): Use a loop like in
+	`isearch-search'.  Call isearch-success-function to skip matches
+	outside the current isearch scope.  Let-bind search-invisible to
+	nil to not match invisible text.
+
+	* isearch.el (isearch-query-replace, isearch-highlight-regexp):
+	Let-bind `isearch-recursive-edit' to nil to prevent calling
+	`exit-recursive-edit' in `isearch-done' that terminates the
+	execution of these commands when it is non-nil.  Call
+	`exit-recursive-edit' explicitly at the end.
+	(isearch-occur): For word search construct the correct regexp
+	with word boundaries to proceed with occur.
+
+	* isearch.el (isearch-search-fun): Compare the length of the
+	current search string with the length of the string from the
+	previous search state to detect the situation when the user
+	adds or removes characters in the search string.
+	Use word-search-forward-lax and word-search-backward-lax in this
+	case, and otherwise word-search-forward and word-search-backward.
+
 2008-11-11  Sam Steingold  <sds@gnu.org>
 
 	* mouse.el (mouse-buffer-menu-mode-groups): Place "Annotate" into
diff --git a/lisp/dired-aux.el b/lisp/dired-aux.el
index 26d5ce4ec67..930c4e32340 100644
--- a/lisp/dired-aux.el
+++ b/lisp/dired-aux.el
@@ -2355,14 +2355,16 @@ Intended to be added to `isearch-mode-hook'."
 (defun dired-isearch-filenames ()
   "Search for a string using Isearch only in file names in the Dired buffer."
   (interactive)
-  (let ((dired-isearch-filenames t))
+  (let ((dired-isearch-filenames t)
+	(isearch-message-prefix-add "filename "))
     (isearch-forward)))
 
 ;;;###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))
+  (let ((dired-isearch-filenames t)
+	(isearch-message-prefix-add "filename "))
     (isearch-forward-regexp)))