From: Juri Linkov <juri@jurta.org>
To: Michael Heerdegen <michael_heerdegen@web.de>
Cc: Stefan Monnier <monnier@iro.umontreal.ca>, 14013@debbugs.gnu.org
Subject: bug#14013: 24.3.50; dired-isearch-filenames-regexp is matching text outside filenames
Date: Sun, 03 Apr 2022 21:05:07 +0300 [thread overview]
Message-ID: <86pmlyqbfh.fsf@mail.linkov.net> (raw)
In-Reply-To: <861qygal8h.fsf@mail.linkov.net> (Juri Linkov's message of "Fri, 01 Apr 2022 19:39:10 +0300")
[-- Attachment #1: Type: text/plain, Size: 533 bytes --]
>> I wonder if it is realistic to use a temporary helper buffer to
>> implement ^.
>
> Good idea. Maybe even not a buffer, but just a string.
> Are there any differences between buffer matching and string matching?
>
> Then first we could remove ^ from the search regexp, and when it finds
> something, then get the found buffer-substring using text properties
> and match it with the original regexp that contains ^.
This works surprisingly well. Maybe there are more corner cases,
but something already works with quick tests:
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: dired-isearch-search-filenames.patch --]
[-- Type: text/x-diff, Size: 1513 bytes --]
diff --git a/lisp/dired-aux.el b/lisp/dired-aux.el
index c49e4e91d8..0832ea1ddb 100644
--- a/lisp/dired-aux.el
+++ b/lisp/dired-aux.el
@@ -3202,7 +3202,16 @@ dired-isearch-search-filenames
(if isearch-forward old (max (1- old) (point-min)))
property)
old))
- end found)
+ end found regexp (i 0))
+ (when isearch-regexp
+ (setq regexp string)
+ (while (string-match "\\^\\|\\$\\|\\\\`\\|\\\\'" string i)
+ (setq i (- (match-end 0) (length (match-string 0 string))))
+ (if (save-match-data (not (subregexp-context-p
+ string (match-beginning 0))))
+ ;; The ^/$ is inside a char-range or escaped or something.
+ nil
+ (setq string (replace-match "" t t string)))))
;; Otherwise, try to search for the next property.
(unless beg
(setq beg (if isearch-forward
@@ -3221,6 +3230,9 @@ dired-isearch-search-filenames
(max bound end))
end)
noerror count))
+ (when (and regexp (not (string-match-p
+ regexp (buffer-substring beg end))))
+ (setq found nil))
(unless found
(setq beg (if isearch-forward
(next-single-property-change end property)
next prev parent reply other threads:[~2022-04-03 18:05 UTC|newest]
Thread overview: 72+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-03-20 23:39 bug#14013: 24.3.50; dired-isearch-filenames-regexp is matching text outside filenames Michael Heerdegen
2013-03-20 23:59 ` Juri Linkov
2013-03-21 0:35 ` Michael Heerdegen
2013-03-21 0:45 ` Juri Linkov
2013-03-21 2:24 ` Michael Heerdegen
2013-03-21 23:03 ` Juri Linkov
2013-03-22 0:30 ` Michael Heerdegen
2013-03-22 0:45 ` Juri Linkov
2013-03-22 1:28 ` Michael Heerdegen
2013-03-23 0:49 ` Juri Linkov
2013-03-22 1:59 ` Stefan Monnier
2013-03-23 0:44 ` Juri Linkov
2013-04-19 21:06 ` Michael Heerdegen
2013-04-20 1:49 ` Stefan Monnier
2013-05-27 20:50 ` Juri Linkov
2013-05-27 23:00 ` Michael Heerdegen
2013-05-27 23:45 ` Juri Linkov
2022-02-13 18:59 ` Juri Linkov
2022-02-14 1:13 ` Michael Heerdegen
2022-02-14 7:41 ` Juri Linkov
2022-02-14 12:59 ` Stefan Monnier via Bug reports for GNU Emacs, the Swiss army knife of text editors
2022-02-16 1:11 ` Michael Heerdegen
2022-02-16 3:57 ` Stefan Monnier via Bug reports for GNU Emacs, the Swiss army knife of text editors
2022-02-15 3:12 ` Michael Heerdegen
2022-02-15 19:25 ` Juri Linkov
2022-02-16 1:23 ` Michael Heerdegen
2022-02-16 3:36 ` bug#14013: [External] : " Drew Adams
2022-02-16 18:11 ` Juri Linkov
2022-02-21 1:16 ` Michael Heerdegen
2022-02-16 0:56 ` Michael Heerdegen
2022-02-22 17:02 ` Juri Linkov
2022-02-22 20:21 ` Michael Heerdegen
2022-02-22 22:27 ` Michael Heerdegen
2022-02-23 8:13 ` Juri Linkov
2022-02-23 18:53 ` Juri Linkov
2022-02-24 0:30 ` Michael Heerdegen
2022-02-26 4:45 ` Michael Heerdegen
2022-03-10 19:28 ` Juri Linkov
2022-03-28 18:01 ` Juri Linkov
2022-04-01 2:18 ` Michael Heerdegen
2022-04-01 16:39 ` Juri Linkov
2022-04-03 18:05 ` Juri Linkov [this message]
2022-04-04 19:40 ` Juri Linkov
2022-05-31 9:40 ` Michael Heerdegen
2022-06-08 16:28 ` Juri Linkov
2022-06-10 17:17 ` Juri Linkov
2022-06-12 16:46 ` Juri Linkov
2022-05-31 8:33 ` Michael Heerdegen
2022-06-09 17:30 ` Juri Linkov
2022-06-15 16:34 ` Juri Linkov
2022-06-30 17:45 ` Juri Linkov
2022-07-03 17:34 ` Michael Heerdegen
2022-07-03 18:23 ` Juri Linkov
2022-07-03 18:43 ` Michael Heerdegen
2022-07-03 19:49 ` Stefan Monnier via Bug reports for GNU Emacs, the Swiss army knife of text editors
2022-07-08 17:59 ` Juri Linkov
2022-06-10 16:44 ` Juri Linkov
2022-06-14 16:31 ` Juri Linkov
2023-06-02 1:34 ` Michael Heerdegen
2023-06-02 6:28 ` Juri Linkov
2023-06-02 22:29 ` Michael Heerdegen
2023-06-04 7:36 ` Juri Linkov
2023-06-06 0:27 ` Michael Heerdegen
2021-04-20 0:33 ` Michael Heerdegen
2021-04-20 19:22 ` Juri Linkov
2021-04-22 0:21 ` Michael Heerdegen
2021-04-22 21:51 ` Juri Linkov
2021-04-22 22:17 ` bug#14013: [External] : " Drew Adams
2021-04-22 23:04 ` Michael Heerdegen
2021-04-22 23:16 ` Michael Heerdegen
2021-04-23 16:52 ` Juri Linkov
2022-02-08 19:32 ` 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=86pmlyqbfh.fsf@mail.linkov.net \
--to=juri@jurta.org \
--cc=14013@debbugs.gnu.org \
--cc=michael_heerdegen@web.de \
--cc=monnier@iro.umontreal.ca \
/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).