From: Juri Linkov <juri@linkov.net>
Date: Wed, 15 Jun 2022 07:32:09 +0000 (+0300)
Subject: Update args of isearch-search-fun-in-text-property (bug#14013)
X-Git-Tag: emacs-29.0.90~1447^2~1744
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=112b6b8e37b5df268ced98c4354802275a4da417;p=emacs.git

Update args of isearch-search-fun-in-text-property (bug#14013)

* lisp/isearch.el (isearch-search-fun-in-text-property): Swap signature args.
* lisp/dired-aux.el (dired-isearch-search-filenames): Update the call.
---

diff --git a/lisp/dired-aux.el b/lisp/dired-aux.el
index d16aee0fa86..1b7088104d7 100644
--- a/lisp/dired-aux.el
+++ b/lisp/dired-aux.el
@@ -3208,7 +3208,7 @@ Intended to be added to `isearch-mode-hook'."
 The returned function narrows the search to match the search string
 only as part of a file name enclosed by the text property `dired-filename'.
 It's intended to override the default search function."
-  (isearch-search-fun-in-text-property 'dired-filename (funcall orig-fun)))
+  (isearch-search-fun-in-text-property (funcall orig-fun) 'dired-filename))
 
 ;;;###autoload
 (defun dired-isearch-filenames ()
diff --git a/lisp/isearch.el b/lisp/isearch.el
index 91aaa66a5b5..7650ebcfcea 100644
--- a/lisp/isearch.el
+++ b/lisp/isearch.el
@@ -4455,12 +4455,12 @@ LAX-WHITESPACE: The value of `isearch-lax-whitespace' and
         (funcall after-change nil nil nil)))))
 
 
-(defun isearch-search-fun-in-text-property (property &optional search-fun)
+(defun isearch-search-fun-in-text-property (search-fun property)
   "Return the function to search inside text that has the specified PROPERTY.
 The function will limit the search for matches only inside text which has
 this property in the current buffer.
-Optional argument SEARCH-FUN provides the function to search text, and
-defaults to the value of `isearch-search-fun-default'."
+The argument SEARCH-FUN provides the function to search text, and
+defaults to the value of `isearch-search-fun-default' when nil."
   (lambda (string &optional bound noerror count)
     (let* ((old (point))
            ;; Check if point is already on the property.