[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 22:09:12 +0300 |
User-agent: |
Mozilla/5.0 (X11; Linux x86_64; rv:68.0) Gecko/20100101 Thunderbird/68.7.0 |
On 29.04.2020 21:38, Michael Albinus wrote:
No. dir is a remote file name. So you must still declare dirname as
(file-local-name dir).
Right, thank you. I also see no reason not to pass the local name to
xref--find-ignores-arguments (xref-matches-in-directory ends up doing
that already).
So the patch will be:
diff --git a/lisp/progmodes/project.el b/lisp/progmodes/project.el
index dbc967b885..f5f4092bab 100644
--- a/lisp/progmodes/project.el
+++ b/lisp/progmodes/project.el
@@ -186,16 +186,14 @@ project--files-in-directory
(require 'xref)
(defvar find-name-arg)
(let* ((default-directory dir)
- (dirname (file-remote-p dir 'localname))
- (dirname (or dirname
- ;; Make sure ~/ etc. in local directory name is
- ;; expanded and not left for the shell command
- ;; to interpret.
- (expand-file-name dir)))
+ ;; Make sure ~/ etc. in local directory name is
+ ;; expanded and not left for the shell command
+ ;; to interpret.
+ (localdir (file-local-name (expand-file-name dir)))
(command (format "%s %s %s -type f %s -print0"
find-program
- dirname
- (xref--find-ignores-arguments ignores dirname)
+ localdir
+ (xref--find-ignores-arguments ignores localdir)
(if files
(concat (shell-quote-argument "(")
" " find-name-arg " "
- bug#40940: 27.0.91; project-query-replace-regexp stops too early, (continued)
- 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
- 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 <=
- 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, 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, Michael Albinus, 2020/04/29