Re: [Emacs-diffs] master 55ec674: * lisp/multifile.el: New file, extracted from etags.el

[Dmitry Gutov <dgutov@yandex.ru>]

[-- Attachment #1: Type: text/plain, Size: 667 bytes --]

On 04.01.2019 02:06, Dmitry Gutov wrote:
> On 03.01.2019 18:35, Stefan Monnier wrote:
> 
>> Indeed.  My conclusion from this discussion is that multifile.el should
>> not accrue commands like those of project.el: it's a library that can be
>> used by things like tags.el or project.el, with a limited scope.
> 
> I agree with that. But still, I'm very tempted to rename project-search 
> to fileloop-find-regexp-in-project and project-query-replace to 
> fileloop-query-replace-regexp-in-project.

So... which of these changes do you prefer?

Inserting -fileloop- to the names of he commands, or moving them to the 
fileloop package altogether?

Two diffs attached.

[-- Attachment #2: project-fileloop.diff --]
[-- Type: text/x-patch, Size: 848 bytes --]

diff --git a/lisp/progmodes/project.el b/lisp/progmodes/project.el
index fbf761c60c..dea2cd30d6 100644
--- a/lisp/progmodes/project.el
+++ b/lisp/progmodes/project.el
@@ -522,7 +522,7 @@ project--completing-read-strict
 (declare-function fileloop-continue "fileloop" ())
 
 ;;;###autoload
-(defun project-search (regexp)
+(defun project-fileloop-search (regexp)
   "Search for REGEXP in all the files of the project.
 Stops when a match is found.
 To continue searching for next match, use command \\[fileloop-continue]."
@@ -532,7 +532,7 @@ project-search
   (fileloop-continue))
 
 ;;;###autoload
-(defun project-query-replace (from to)
+(defun project-fileloop-query-replace (from to)
   "Search for REGEXP in all the files of the project.
 Stops when a match is found.
 To continue searching for next match, use command \\[fileloop-continue]."

[-- Attachment #3: fileloop-project.diff --]
[-- Type: text/x-patch, Size: 2436 bytes --]

diff --git a/lisp/fileloop.el b/lisp/fileloop.el
index 2e77811a57..b07b81bc1e 100644
--- a/lisp/fileloop.el
+++ b/lisp/fileloop.el
@@ -213,5 +213,28 @@ fileloop-initialize-replace
    (lambda ()
      (perform-replace from to t t delimited nil multi-query-replace-map))))
 
+;;;###autoload
+(defun fileloop-search-in-project (regexp)
+  "Search for REGEXP in all the files of the project.
+Stops when a match is found.
+To continue searching for next match, use command \\[fileloop-continue]."
+  (interactive "sSearch (regexp): ")
+  (fileloop-initialize-search
+   regexp (project-files (project-current t)) 'default)
+  (fileloop-continue))
+
+;;;###autoload
+(defun fileloop-query-replace-in-project (from to)
+  "Search for REGEXP in all the files of the project.
+Stops when a match is found.
+To continue searching for next match, use command \\[fileloop-continue]."
+  (interactive
+   (pcase-let ((`(,from ,to)
+                (query-replace-read-args "Query replace (regexp)" t t)))
+     (list from to)))
+  (fileloop-initialize-replace
+   from to (project-files (project-current t)) 'default)
+  (fileloop-continue))
+
 (provide 'fileloop)
 ;;; fileloop.el ends here
diff --git a/lisp/progmodes/project.el b/lisp/progmodes/project.el
index fbf761c60c..e526249d48 100644
--- a/lisp/progmodes/project.el
+++ b/lisp/progmodes/project.el
@@ -519,30 +519,5 @@ project--completing-read-strict
                              inherit-input-method)))
     (concat common-parent-directory res)))
 
-(declare-function fileloop-continue "fileloop" ())
-
-;;;###autoload
-(defun project-search (regexp)
-  "Search for REGEXP in all the files of the project.
-Stops when a match is found.
-To continue searching for next match, use command \\[fileloop-continue]."
-  (interactive "sSearch (regexp): ")
-  (fileloop-initialize-search
-   regexp (project-files (project-current t)) 'default)
-  (fileloop-continue))
-
-;;;###autoload
-(defun project-query-replace (from to)
-  "Search for REGEXP in all the files of the project.
-Stops when a match is found.
-To continue searching for next match, use command \\[fileloop-continue]."
-  (interactive
-   (pcase-let ((`(,from ,to)
-                (query-replace-read-args "Query replace (regexp)" t t)))
-     (list from to)))
-  (fileloop-initialize-replace
-   from to (project-files (project-current t)) 'default)
-  (fileloop-continue))
-
 (provide 'project)
 ;;; project.el ends here