From: Dmitry Gutov <dgutov@yandex.ru>
To: Eli Zaretskii <eliz@gnu.org>
Cc: simenheg@runbox.com, monnier@IRO.UMontreal.CA, 40940@debbugs.gnu.org
Subject: bug#40940: 27.0.91; project-query-replace-regexp stops too early
Date: Sun, 3 May 2020 04:43:26 +0300 [thread overview]
Message-ID: <e884d305-cb2b-d58a-ac54-1494ce9e5b9b@yandex.ru> (raw)
In-Reply-To: <835zdevnsh.fsf@gnu.org>
On 02.05.2020 09:44, Eli Zaretskii wrote:
> I can update the doc string, yes. But I don't think it's a good idea
> to divide the coding part between us, though. So please show the
> code, and I will suggest the doc change.
Here's the comprehensive fix I'd like to see:
diff --git a/lisp/fileloop.el b/lisp/fileloop.el
index 543963feaf..69825fdcae 100644
--- a/lisp/fileloop.el
+++ b/lisp/fileloop.el
@@ -181,8 +181,7 @@ fileloop-initialize-search
(fileloop-initialize
files
(lambda ()
- (let ((case-fold-search
- (if (memq case-fold '(t nil)) case-fold case-fold-search)))
+ (let ((case-fold-search (fileloop--case-fold regexp case-fold)))
(re-search-forward regexp nil t)))
(lambda ()
(unless (eq last-buffer (current-buffer))
@@ -190,6 +189,15 @@ fileloop-initialize-search
(message "Scanning file %s...found" buffer-file-name))
nil))))
+(defun fileloop--case-fold (regexp case-fold)
+ (let ((value
+ (if (memql case-fold '(nil t))
+ case-fold
+ case-fold-search)))
+ (if (and value search-upper-case)
+ (isearch-no-upper-case-p regexp t)
+ value)))
+
;;;###autoload
(defun fileloop-initialize-replace (from to files case-fold &optional
delimited)
"Initialize a new round of query&replace on several files.
@@ -203,15 +211,15 @@ fileloop-initialize-replace
(fileloop-initialize
files
(lambda ()
- (let ((case-fold-search
- (if (memql case-fold '(nil t)) case-fold case-fold-search)))
+ (let ((case-fold-search (fileloop--case-fold from case-fold)))
(if (re-search-forward from nil t)
;; When we find a match, move back
;; to the beginning of it so perform-replace
;; will see it.
(goto-char (match-beginning 0)))))
(lambda ()
- (perform-replace from to t t delimited nil multi-query-replace-map))))
+ (let ((case-fold-search (fileloop--case-fold from case-fold)))
+ (perform-replace from to t t delimited nil
multi-query-replace-map)))))
(provide 'fileloop)
;;; fileloop.el ends here
next prev parent reply other threads:[~2020-05-03 1:43 UTC|newest]
Thread overview: 38+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-04-28 14:35 bug#40940: 27.0.91; project-query-replace-regexp stops too early Simen Heggestøyl
2020-04-29 3:54 ` Dmitry Gutov
2020-04-29 7:35 ` Eli Zaretskii
2020-04-29 8:29 ` Simen Heggestøyl
2020-04-29 8:37 ` Eli Zaretskii
2020-04-29 9:24 ` Eli Zaretskii
2020-04-29 10:41 ` Eli Zaretskii
2020-04-29 20:53 ` Dmitry Gutov
2020-04-30 20:16 ` Juri Linkov
2020-05-01 6:00 ` Eli Zaretskii
2020-05-01 6:57 ` Eli Zaretskii
2020-05-01 15:27 ` Dmitry Gutov
2020-05-01 15:45 ` Eli Zaretskii
2020-05-01 23:21 ` Dmitry Gutov
2020-05-02 6:44 ` Eli Zaretskii
2020-05-02 7:56 ` Eli Zaretskii
2020-05-03 1:43 ` Dmitry Gutov [this message]
2020-05-03 6:54 ` Simen Heggestøyl
2020-05-03 17:10 ` Eli Zaretskii
2020-05-03 17:28 ` Dmitry Gutov
2020-05-03 23:58 ` Dmitry Gutov
2020-04-29 14:50 ` Dmitry Gutov
2020-04-29 14:59 ` Eli Zaretskii
2020-04-29 15:42 ` Dmitry Gutov
2020-04-29 16:04 ` Eli Zaretskii
2020-04-29 16:11 ` Dmitry Gutov
2020-04-29 15:49 ` Michael Albinus
2020-04-29 15:58 ` Dmitry Gutov
2020-04-29 16:10 ` Eli Zaretskii
2020-04-29 16:22 ` Michael Albinus
2020-04-29 16:44 ` Eli Zaretskii
2020-04-29 18:20 ` Dmitry Gutov
2020-04-29 18:38 ` Michael Albinus
2020-04-29 19:09 ` Dmitry Gutov
2020-04-29 19:15 ` Michael Albinus
2020-04-29 19:26 ` Eli Zaretskii
2020-04-29 18:44 ` Eli Zaretskii
2020-04-29 18:56 ` Michael Albinus
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
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=e884d305-cb2b-d58a-ac54-1494ce9e5b9b@yandex.ru \
--to=dgutov@yandex.ru \
--cc=40940@debbugs.gnu.org \
--cc=eliz@gnu.org \
--cc=monnier@IRO.UMontreal.CA \
--cc=simenheg@runbox.com \
/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 external index
https://git.savannah.gnu.org/cgit/emacs.git
https://git.savannah.gnu.org/cgit/emacs/org-mode.git
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.