# HG changeset patch # User Juri Linkov # Date 1230066137 0 # Node ID f05bf71fe0fb8eaf96d91c22e18cc13ff55e4170 # Parent d5b2b9c1f3f8a36e9a3d130937b9764502a7567a (dired-isearch-filenames-toggle): Use the original value from `dired-isearch-filter-predicate-orig' instead of the symbol `isearch-filter-invisible'. Doc fix. (dired-isearch-filter-filenames): Replace `isearch-filter-invisible' with `isearch-filter-visible'. Doc fix. diff -r d5b2b9c1f3f8 -r f05bf71fe0fb lisp/dired-aux.el --- a/lisp/dired-aux.el Tue Dec 23 21:01:41 2008 +0000 +++ b/lisp/dired-aux.el Tue Dec 23 21:02:17 2008 +0000 @@ -2320,11 +2320,11 @@ "Toggle file names searching on or off. When on, Isearch skips matches outside file names using the predicate `dired-isearch-filter-filenames' that matches only at file names. -When off, it uses the default predicate `isearch-filter-invisible'." +When off, it uses the original predicate." (interactive) (setq isearch-filter-predicate (if (eq isearch-filter-predicate 'dired-isearch-filter-filenames) - 'isearch-filter-invisible + dired-isearch-filter-predicate-orig 'dired-isearch-filter-filenames)) (setq isearch-success t isearch-adjusted t) (isearch-update)) @@ -2351,8 +2351,10 @@ (remove-hook 'isearch-mode-end-hook 'dired-isearch-filenames-end t)) (defun dired-isearch-filter-filenames (beg end) - "Match only at visible regions with the text property `dired-filename'." - (and (isearch-filter-invisible beg end) + "Test whether the current search hit is a visible file name. +Return non-nil if the text from BEG to END is part of a file +name (has the text property `dired-filename') and is visible." + (and (isearch-filter-visible beg end) (if dired-isearch-filenames (text-property-not-all (min beg end) (max beg end) 'dired-filename nil)