[Emacs-diffs] emacs/lisp dired-aux.el

[Juri Linkov]

CVSROOT:        /sources/emacs
Module name:    emacs
Changes by:     Juri Linkov <jurta>     08/12/23 21:02:18

Modified files:
        lisp           : dired-aux.el 

Log message:
        (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.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/emacs/lisp/dired-aux.el?cvsroot=emacs&r1=1.184&r2=1.185

Patches:
Index: dired-aux.el
===================================================================
RCS file: /sources/emacs/emacs/lisp/dired-aux.el,v
retrieving revision 1.184
retrieving revision 1.185
diff -u -b -r1.184 -r1.185
--- dired-aux.el        3 Dec 2008 05:48:21 -0000       1.184
+++ dired-aux.el        23 Dec 2008 21:02:17 -0000      1.185
@@ -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)