From: Juri Linkov <juri@jurta.org>
To: Michael Heerdegen <michael_heerdegen@web.de>
Cc: 14013@debbugs.gnu.org
Subject: bug#14013: 24.3.50; dired-isearch-filenames-regexp is matching text outside filenames
Date: Fri, 22 Mar 2013 01:03:31 +0200 [thread overview]
Message-ID: <87vc8ke4os.fsf@mail.jurta.org> (raw)
In-Reply-To: <87zjxxsd6c.fsf@web.de> (Michael Heerdegen's message of "Thu, 21 Mar 2013 03:24:11 +0100")
> Would it be an appropriate approach to use a more sophisticated value
> for `isearch-search-fun-function' for that case? This function could
> e.g. jump to the next filename before starting searching.
Instead of duplicating the complex logic of `isearch-search-fun-function'
in a new specialized function it would be better to implement this
using hooks.
We have already a post-processing hook `isearch-update-post-hook'
invoked after isearch has found matches. So we need a similar hook
invoked before isearch starts searching matches, with a name like
`isearch-search-fun-pre-hook'.
It fixes your test case of searching for ".*":
=== modified file 'lisp/isearch.el'
--- lisp/isearch.el 2013-02-25 21:10:59 +0000
+++ lisp/isearch.el 2013-03-21 22:53:41 +0000
@@ -163,6 +163,9 @@ (defcustom isearch-resume-in-command-his
(defvar isearch-mode-hook nil
"Function(s) to call after starting up an incremental search.")
+(defvar isearch-search-fun-pre-hook nil
+ "Function(s) to call before isearch starts searching matches in the buffer.")
+
(defvar isearch-update-post-hook nil
"Function(s) to call after isearch has found matches in the buffer.")
@@ -2651,7 +2654,9 @@ (defun isearch-search-string (string bou
If found, move point to the end of the occurrence,
update the match data, and return point."
(let* ((func (isearch-search-fun))
- (pos1 (save-excursion (funcall func string bound noerror)))
+ (pos1 (save-excursion
+ (run-hooks 'isearch-search-fun-pre-hook)
+ (funcall func string bound noerror)))
pos2)
(when (and
;; Avoid "obsolete" warnings for translation-table-for-input.
=== modified file 'lisp/dired-aux.el'
--- lisp/dired-aux.el 2013-02-28 21:51:11 +0000
+++ lisp/dired-aux.el 2013-03-21 22:54:14 +0000
@@ -2506,6 +2506,12 @@ (defun dired-isearch-filenames-toggle ()
(setq isearch-success t isearch-adjusted t)
(isearch-update))
+(defun dired-isearch-filenames-pre-hook ()
+ (unless (get-text-property (point) 'dired-filename)
+ (if isearch-forward
+ (goto-char (or (next-single-property-change (point) 'dired-filename) (point-max)))
+ (goto-char (or (previous-single-property-change (point) 'dired-filename) (point-min))))))
+
;;;###autoload
(defun dired-isearch-filenames-setup ()
"Set up isearch to search in Dired file names.
@@ -2518,14 +2524,16 @@ (defun dired-isearch-filenames-setup ()
(setq dired-isearch-filter-predicate-orig
(default-value 'isearch-filter-predicate))
(setq-default isearch-filter-predicate 'dired-isearch-filter-filenames)
- (add-hook 'isearch-mode-end-hook 'dired-isearch-filenames-end nil t)))
+ (add-hook 'isearch-mode-end-hook 'dired-isearch-filenames-end nil t)
+ (add-hook 'isearch-search-fun-pre-hook 'dired-isearch-filenames-pre-hook nil t)))
(defun dired-isearch-filenames-end ()
"Clean up the Dired file name search after terminating isearch."
(setq isearch-message-prefix-add nil)
(define-key isearch-mode-map "\M-sf" nil)
(setq-default isearch-filter-predicate dired-isearch-filter-predicate-orig)
- (remove-hook 'isearch-mode-end-hook 'dired-isearch-filenames-end t))
+ (remove-hook 'isearch-mode-end-hook 'dired-isearch-filenames-end t)
+ (remove-hook 'isearch-search-fun-pre-hook 'dired-isearch-filenames-pre-hook t))
(defun dired-isearch-filter-filenames (beg end)
"Test whether the current search hit is a visible file name.
=== modified file 'lisp/wdired.el'
--- lisp/wdired.el 2013-03-05 17:13:01 +0000
+++ lisp/wdired.el 2013-03-21 22:55:11 +0000
@@ -241,6 +241,7 @@ (defun wdired-change-to-wdired-mode ()
(set (make-local-variable 'query-replace-skip-read-only) t)
(set (make-local-variable 'isearch-filter-predicate)
'wdired-isearch-filter-read-only)
+ (add-hook 'isearch-search-fun-pre-hook 'dired-isearch-filenames-pre-hook nil t)
(use-local-map wdired-mode-map)
(force-mode-line-update)
(setq buffer-read-only nil)
Also (run-hooks 'isearch-search-fun-pre-hook) should be added to replace.el,
but first I have to install the pending patches in bug#11378 and bug#11746.
next prev parent reply other threads:[~2013-03-21 23:03 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 [this message]
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
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=87vc8ke4os.fsf@mail.jurta.org \
--to=juri@jurta.org \
--cc=14013@debbugs.gnu.org \
--cc=michael_heerdegen@web.de \
/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).