From: Juri Linkov <juri@jurta.org>
Date: Mon, 28 Jul 2008 14:32:34 +0000 (+0000)
Subject: (dired-mode-map): Bind dired-do-isearch to `M-s a C-s'
X-Git-Tag: emacs-pretest-23.0.90~3841
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=b89b46cfb8f1143ea511b199b6c14b9726ce60de;p=emacs.git

(dired-mode-map): Bind dired-do-isearch to `M-s a C-s'
and dired-do-isearch-regexp to `M-s a M-C-s'.  Add menu items.
---

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 0a1a6b32eb0..db2d8b78e55 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,11 @@
+2008-07-28  Juri Linkov  <juri@jurta.org>
+
+	* dired-aux.el (dired-do-isearch, dired-do-isearch-regexp):
+	New functions.
+
+	* dired.el (dired-mode-map): Bind dired-do-isearch to `M-s a C-s'
+	and dired-do-isearch-regexp to `M-s a M-C-s'.  Add menu items.
+
 2008-07-28  Seiji Zenitani  <zenitani <at> mac.com>
 
 	* help-fns.el (help-C-file-name): Add .m (Obj-C code) for Cocoa port.
diff --git a/lisp/dired.el b/lisp/dired.el
index 49a69eb60c6..fdfac22b1e3 100644
--- a/lisp/dired.el
+++ b/lisp/dired.el
@@ -1295,6 +1295,9 @@ Do so according to the former subdir alist OLD-SUBDIR-ALIST."
     ;; hiding
     (define-key map "$" 'dired-hide-subdir)
     (define-key map "\M-$" 'dired-hide-all)
+    ;; isearch
+    (define-key map (kbd "M-s a C-s")   'dired-do-isearch)
+    (define-key map (kbd "M-s a M-C-s") 'dired-do-isearch-regexp)
     ;; misc
     (define-key map "\C-x\C-q" 'dired-toggle-read-only)
     (define-key map "?" 'dired-summary)
@@ -1560,6 +1563,12 @@ Do so according to the former subdir alist OLD-SUBDIR-ALIST."
     (define-key map [menu-bar operate search]
       '(menu-item "Search Files..." dired-do-search
 		  :help "Search marked files for regexp"))
+    (define-key map [menu-bar operate isearch-regexp]
+      '(menu-item "Isearch Regexp Files..." dired-do-isearch-regexp
+		  :help "Incrementally search marked files for regexp"))
+    (define-key map [menu-bar operate isearch]
+      '(menu-item "Isearch Files..." dired-do-isearch
+		  :help "Incrementally search marked files for string"))
     (define-key map [menu-bar operate chown]
       '(menu-item "Change Owner..." dired-do-chown
 		  :visible (not (memq system-type '(ms-dos windows-nt)))