aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--lisp/dired.el10
1 files changed, 10 insertions, 0 deletions
diff --git a/lisp/dired.el b/lisp/dired.el
index fdfac22b1e3..311744eeca0 100644
--- a/lisp/dired.el
+++ b/lisp/dired.el
@@ -1068,6 +1068,7 @@ If HDR is non-nil, insert a header line with the directory name."
1068 (dired-move-to-end-of-filename) 1068 (dired-move-to-end-of-filename)
1069 (point)) 1069 (point))
1070 '(mouse-face highlight 1070 '(mouse-face highlight
1071 dired-filename t
1071 help-echo "mouse-2: visit this file in other window"))) 1072 help-echo "mouse-2: visit this file in other window")))
1072 (error nil)) 1073 (error nil))
1073 (forward-line 1)))) 1074 (forward-line 1))))
@@ -1298,6 +1299,8 @@ Do so according to the former subdir alist OLD-SUBDIR-ALIST."
1298 ;; isearch 1299 ;; isearch
1299 (define-key map (kbd "M-s a C-s") 'dired-do-isearch) 1300 (define-key map (kbd "M-s a C-s") 'dired-do-isearch)
1300 (define-key map (kbd "M-s a M-C-s") 'dired-do-isearch-regexp) 1301 (define-key map (kbd "M-s a M-C-s") 'dired-do-isearch-regexp)
1302 (define-key map (kbd "M-s f C-s") 'dired-isearch-filenames)
1303 (define-key map (kbd "M-s f M-C-s") 'dired-isearch-filenames-regexp)
1301 ;; misc 1304 ;; misc
1302 (define-key map "\C-x\C-q" 'dired-toggle-read-only) 1305 (define-key map "\C-x\C-q" 'dired-toggle-read-only)
1303 (define-key map "?" 'dired-summary) 1306 (define-key map "?" 'dired-summary)
@@ -1409,6 +1412,12 @@ Do so according to the former subdir alist OLD-SUBDIR-ALIST."
1409 (define-key map [menu-bar immediate dashes] 1412 (define-key map [menu-bar immediate dashes]
1410 '("--")) 1413 '("--"))
1411 1414
1415 (define-key map [menu-bar immediate isearch-filenames-regexp]
1416 '(menu-item "Isearch Regexp in File Names..." dired-isearch-filenames-regexp
1417 :help "Incrementally search for regexp in file names only"))
1418 (define-key map [menu-bar immediate isearch-filenames]
1419 '(menu-item "Isearch in File Names..." dired-isearch-filenames
1420 :help "Incrementally search for string in file names only."))
1412 (define-key map [menu-bar immediate compare-directories] 1421 (define-key map [menu-bar immediate compare-directories]
1413 '(menu-item "Compare Directories..." dired-compare-directories 1422 '(menu-item "Compare Directories..." dired-compare-directories
1414 :help "Mark files with different attributes in two dired buffers")) 1423 :help "Mark files with different attributes in two dired buffers"))
@@ -1723,6 +1732,7 @@ Keybindings:
1723 (when (featurep 'dnd) 1732 (when (featurep 'dnd)
1724 (set (make-local-variable 'dnd-protocol-alist) 1733 (set (make-local-variable 'dnd-protocol-alist)
1725 (append dired-dnd-protocol-alist dnd-protocol-alist))) 1734 (append dired-dnd-protocol-alist dnd-protocol-alist)))
1735 (add-hook 'isearch-mode-hook 'dired-isearch-filenames-setup nil t)
1726 (run-mode-hooks 'dired-mode-hook)) 1736 (run-mode-hooks 'dired-mode-hook))
1727 1737
1728;; Idiosyncratic dired commands that don't deal with marks. 1738;; Idiosyncratic dired commands that don't deal with marks.