unofficial mirror of bug-gnu-emacs@gnu.org 
 help / color / mirror / code / Atom feed
From: Eli Zaretskii <eliz@gnu.org>
To: dgutov@yandex.ru
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: Wed, 29 Apr 2020 13:41:50 +0300	[thread overview]
Message-ID: <83mu6uzi8h.fsf@gnu.org> (raw)
In-Reply-To: <83zhauzlt7.fsf@gnu.org> (message from Eli Zaretskii on Wed, 29 Apr 2020 12:24:36 +0300)

> Date: Wed, 29 Apr 2020 12:24:36 +0300
> From: Eli Zaretskii <eliz@gnu.org>
> Cc: simenheg@runbox.com, monnier@IRO.UMontreal.CA, 40940@debbugs.gnu.org
> 
> First, this is broken if the shell doesn't expand ~/ or if the Emacs
> notion of the home directory is different from that of the shell.

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.  Also, using downcase is not entirely correct, we should
use isearch-no-upper-case-p instead.

Comments?

diff --git a/lisp/fileloop.el b/lisp/fileloop.el
index 543963f..f7a199e 100644
--- a/lisp/fileloop.el
+++ b/lisp/fileloop.el
@@ -204,14 +204,24 @@ fileloop-initialize-replace
    files
    (lambda ()
      (let ((case-fold-search
-            (if (memql case-fold '(nil t)) case-fold case-fold-search)))
+            (if (memql case-fold '(nil t))
+                case-fold
+              (if (equal from (downcase from))
+                  case-fold-search
+                nil))))
        (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
+            (if (memql case-fold '(nil t))
+                case-fold
+              (if (equal from (downcase from))
+                  case-fold-search
+                nil))))
+       (perform-replace from to t t delimited nil multi-query-replace-map)))))
 
 (provide 'fileloop)
 ;;; fileloop.el ends here





  reply	other threads:[~2020-04-29 10:41 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 [this message]
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
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

  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=83mu6uzi8h.fsf@gnu.org \
    --to=eliz@gnu.org \
    --cc=40940@debbugs.gnu.org \
    --cc=dgutov@yandex.ru \
    --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 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).