From: Dmitry Gutov <dgutov@yandex.ru>
Date: Sun, 29 Dec 2019 12:22:11 +0000 (+0300)
Subject: Fix up requires
X-Git-Tag: emacs-27.0.90~257
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=181f571651;p=emacs.git

Fix up requires

* lisp/progmodes/project.el (project-files):
Remove (require 'xref).
(project--files-in-directory): Add it here instead.
(project-find-regexp, project-or-external-find-regexp): And here.
For 'xref--show-xrefs'.
---

diff --git a/lisp/progmodes/project.el b/lisp/progmodes/project.el
index 6d6ede7e5d6..c96d0a6ee15 100644
--- a/lisp/progmodes/project.el
+++ b/lisp/progmodes/project.el
@@ -175,7 +175,6 @@ subset of the project roots and external roots.
 
 The default implementation uses `find-program'.  PROJECT is used
 to find the list of ignores for each directory."
-  (require 'xref)
   (cl-mapcan
    (lambda (dir)
      (project--files-in-directory dir
@@ -184,6 +183,7 @@ to find the list of ignores for each directory."
 
 (defun project--files-in-directory (dir ignores &optional files)
   (require 'find-dired)
+  (require 'xref)
   (defvar find-name-arg)
   (let ((default-directory dir)
         (command (format "%s %s %s -type f %s -print0"
@@ -436,6 +436,7 @@ e.g. entering `ch' is equivalent to `*.[ch]'.  As whitespace
 triggers completion when entering a pattern, including it
 requires quoting, e.g. `\\[quoted-insert]<space>'."
   (interactive (list (project--read-regexp)))
+  (require 'xref)
   (let* ((pr (project-current t))
          (files
           (if (not current-prefix-arg)
@@ -467,6 +468,7 @@ requires quoting, e.g. `\\[quoted-insert]<space>'."
 With \\[universal-argument] prefix, you can specify the file name
 pattern to search for."
   (interactive (list (project--read-regexp)))
+  (require 'xref)
   (let* ((pr (project-current t))
          (files
           (project-files pr (append