[Emacs-diffs] Changes to emacs/lisp/dired-aux.el,v

[Juri Linkov]

CVSROOT:        /sources/emacs
Module name:    emacs
Changes by:     Juri Linkov <jurta>     08/07/31 16:50:54

Index: dired-aux.el
===================================================================
RCS file: /sources/emacs/emacs/lisp/dired-aux.el,v
retrieving revision 1.177
retrieving revision 1.178
diff -u -b -r1.177 -r1.178
--- dired-aux.el        31 Jul 2008 05:33:42 -0000      1.177
+++ dired-aux.el        31 Jul 2008 16:50:54 -0000      1.178
@@ -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))