From: Juri Linkov <juri@linkov.net>
To: Lars Ingebrigtsen <larsi@gnus.org>
Cc: 49534@debbugs.gnu.org
Subject: bug#49534: 26.3; Isearch should support using filter predicates with empty search hits
Date: Tue, 13 Jul 2021 23:20:42 +0300 [thread overview]
Message-ID: <874kcy6k4l.fsf@mail.linkov.net> (raw)
In-Reply-To: <87zguq6mof.fsf@mail.linkov.net> (Juri Linkov's message of "Tue, 13 Jul 2021 22:25:36 +0300")
>>> (= (match-beginning 0) (match-end 0))
>>
>> And, indeed, the default predicate doesn't match on invisible text...
>> but I'm not sure why it's also testing the length of the match. (The
>> default predicate also checks this, so removing the test seems to
>> produce identical results by default.)
>
> I've tried to remove (= (match-beginning 0) (match-end 0))
> and then tried the test case provided by Drew,
> but it goes into an infinite loop.
>
> So it requires advancing by 1 char - the same trick as it's used
> in query-replace, etc.
Oh, I realized that
(= (match-beginning 0) (match-end 0))
was moved below after
(funcall isearch-filter-predicate
(match-beginning 0) (match-end 0))
This means that if isearch-filter-predicate does own matching,
it will break later (= (match-beginning 0) (match-end 0)).
What would be better: to remember its result in a let-bound variable,
or to use save-match-data? Probably, save-match-data:
diff --git a/lisp/isearch.el b/lisp/isearch.el
index 3337d9be68..9113e94c3b 100644
--- a/lisp/isearch.el
+++ b/lisp/isearch.el
@@ -3591,8 +3591,9 @@ isearch-search
;; Clear RETRY unless the search predicate says
;; to skip this search hit.
(if (or (not isearch-success)
- (funcall isearch-filter-predicate
- (match-beginning 0) (match-end 0)))
+ (save-match-data
+ (funcall isearch-filter-predicate
+ (match-beginning 0) (match-end 0))))
(setq retry nil)
;; Advance point on empty matches before retrying
(when (= (match-beginning 0) (match-end 0))
next prev parent reply other threads:[~2021-07-13 20:20 UTC|newest]
Thread overview: 20+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-07-12 14:34 bug#49534: 26.3; Isearch should support using filter predicates with empty search hits Drew Adams
2021-07-13 16:27 ` Lars Ingebrigtsen
2021-07-13 19:25 ` Juri Linkov
2021-07-13 20:20 ` Juri Linkov [this message]
2021-07-13 20:41 ` Lars Ingebrigtsen
2021-07-13 22:30 ` Juri Linkov
2021-07-13 21:42 ` bug#49534: [External] : " Drew Adams
2021-07-13 22:30 ` Juri Linkov
2021-07-13 23:00 ` Drew Adams
2021-07-13 22:48 ` Stefan Monnier via Bug reports for GNU Emacs, the Swiss army knife of text editors
2021-07-13 23:21 ` Juri Linkov
2021-07-13 21:44 ` bug#49534: [External] : " Drew Adams
2021-07-13 22:31 ` Juri Linkov
2021-07-13 23:04 ` Drew Adams
2022-02-16 4:20 ` Drew Adams
2022-02-16 18:20 ` Juri Linkov
2022-02-16 18:54 ` bug#49534: [External] : " Drew Adams
2022-02-16 19:09 ` Juri Linkov
2022-02-16 19:17 ` Drew Adams
2022-02-16 19:25 ` Juri Linkov
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
List information: https://www.gnu.org/software/emacs/
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=874kcy6k4l.fsf@mail.linkov.net \
--to=juri@linkov.net \
--cc=49534@debbugs.gnu.org \
--cc=larsi@gnus.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
Code repositories for project(s) associated with this public inbox
https://git.savannah.gnu.org/cgit/emacs.git
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).