[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
bug#40940: 27.0.91; project-query-replace-regexp stops too early
From: |
Dmitry Gutov |
Subject: |
bug#40940: 27.0.91; project-query-replace-regexp stops too early |
Date: |
Wed, 29 Apr 2020 23:53:46 +0300 |
User-agent: |
Mozilla/5.0 (X11; Linux x86_64; rv:68.0) Gecko/20100101 Thunderbird/68.7.0 |
On 29.04.2020 13:41, Eli Zaretskii wrote:
The patch below seems to fix the rest. Note that I've decided to make
the change in fileloop.el, since I think all the other callers need
the same fix.
Naturally.
Also, using downcase is not entirely correct, we should
use isearch-no-upper-case-p instead.
I usually like isearch-no-upper-case-p behavior, but here it doesn't fit
the docstring, does it? There is no value of CASE-FOLD described that
would indicate that the function will be too smart about it.
So we'd need to update the docstring that the CASE-FOLD value of t will
obey the value of `search-upper-case'. Then we'll consult it as well,
like isearch-search does.
Alternatively, we could for now use the below patch which changes the
behavior less:
diff --git a/lisp/fileloop.el b/lisp/fileloop.el
index 543963feaf..c3c55badf5 100644
--- a/lisp/fileloop.el
+++ b/lisp/fileloop.el
@@ -175,14 +175,16 @@ fileloop-continue
(funcall fileloop--operate-function)))
(setq file-finished t))))
+(defun fileloop--case-fold (arg)
+ (if (memq arg '(t nil)) arg case-fold-search))
+
;;;###autoload
(defun fileloop-initialize-search (regexp files case-fold)
(let ((last-buffer (current-buffer)))
(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 case-fold)))
(re-search-forward regexp nil t)))
(lambda ()
(unless (eq last-buffer (current-buffer))
@@ -203,15 +205,16 @@ 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 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 case-fold))
+ search-upper-case)
+ (perform-replace from to t t delimited nil
multi-query-replace-map)))))
(provide 'fileloop)
;;; fileloop.el ends here
- bug#40940: 27.0.91; project-query-replace-regexp stops too early, Simen Heggestøyl, 2020/04/28
- bug#40940: 27.0.91; project-query-replace-regexp stops too early, Dmitry Gutov, 2020/04/28
- bug#40940: 27.0.91; project-query-replace-regexp stops too early, Eli Zaretskii, 2020/04/29
- bug#40940: 27.0.91; project-query-replace-regexp stops too early, Simen Heggestøyl, 2020/04/29
- bug#40940: 27.0.91; project-query-replace-regexp stops too early, Eli Zaretskii, 2020/04/29
- bug#40940: 27.0.91; project-query-replace-regexp stops too early, Eli Zaretskii, 2020/04/29
- bug#40940: 27.0.91; project-query-replace-regexp stops too early, Eli Zaretskii, 2020/04/29
- bug#40940: 27.0.91; project-query-replace-regexp stops too early,
Dmitry Gutov <=
- bug#40940: 27.0.91; project-query-replace-regexp stops too early, Juri Linkov, 2020/04/30
- bug#40940: 27.0.91; project-query-replace-regexp stops too early, Dmitry Gutov, 2020/04/29
- bug#40940: 27.0.91; project-query-replace-regexp stops too early, Eli Zaretskii, 2020/04/29
- bug#40940: 27.0.91; project-query-replace-regexp stops too early, Dmitry Gutov, 2020/04/29
- bug#40940: 27.0.91; project-query-replace-regexp stops too early, Eli Zaretskii, 2020/04/29
- bug#40940: 27.0.91; project-query-replace-regexp stops too early, Dmitry Gutov, 2020/04/29
- bug#40940: 27.0.91; project-query-replace-regexp stops too early, Michael Albinus, 2020/04/29
- bug#40940: 27.0.91; project-query-replace-regexp stops too early, Dmitry Gutov, 2020/04/29
- bug#40940: 27.0.91; project-query-replace-regexp stops too early, Eli Zaretskii, 2020/04/29
- bug#40940: 27.0.91; project-query-replace-regexp stops too early, Michael Albinus, 2020/04/29