changeset 97148:0cafe389de2f

(dired-isearch-filenames-toggle): New command. (dired-isearch-filenames-setup): Bind "\M-sf" to dired-isearch-filenames-toggle in isearch-mode-map. (dired-isearch-filenames-end): Bind "\M-sf" to nil in isearch-mode-map.
author Juri Linkov <juri@jurta.org>
date Thu, 31 Jul 2008 16:50:54 +0000
parents 3e78f2abb23d
children 1a590c6bdbdc
files lisp/dired-aux.el
diffstat 1 files changed, 16 insertions(+), 0 deletions(-) [+]
line wrap: on
line diff
--- a/lisp/dired-aux.el	Thu Jul 31 14:00:52 2008 +0000
+++ b/lisp/dired-aux.el	Thu Jul 31 16:50:54 2008 +0000
@@ -2308,11 +2308,26 @@
 
 (defvar dired-isearch-orig-success-function nil)
 
+(defun dired-isearch-filenames-toggle ()
+  "Toggle file names searching on or off.
+When on, Isearch checks the success of the current matching point
+using the function `dired-isearch-success-function' that matches only
+at file names.  When off, it uses the default function
+`isearch-success-function-default'."
+  (interactive)
+  (setq isearch-success-function
+	(if (eq isearch-success-function 'dired-isearch-success-function)
+	    'isearch-success-function-default
+	  'dired-isearch-success-function))
+  (setq isearch-success t isearch-adjusted t)
+  (isearch-update))
+
 ;;;###autoload
 (defun dired-isearch-filenames-setup ()
   "Set up isearch to search in Dired file names.
 Intended to be added to `isearch-mode-hook'."
   (when dired-isearch-filenames
+    (define-key isearch-mode-map "\M-sf" 'dired-isearch-filenames-toggle)
     (setq dired-isearch-orig-success-function
 	  (default-value 'isearch-success-function))
     (setq-default isearch-success-function 'dired-isearch-success-function)
@@ -2320,6 +2335,7 @@
 
 (defun dired-isearch-filenames-end ()
   "Clean up the Dired file name search after terminating isearch."
+  (define-key isearch-mode-map "\M-sf" nil)
   (setq-default isearch-success-function dired-isearch-orig-success-function)
   (remove-hook 'isearch-mode-end-hook 'dired-isearch-filenames-end t))