[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
emacs-27 181f571 5/6: Fix up requires
From: |
Dmitry Gutov |
Subject: |
emacs-27 181f571 5/6: Fix up requires |
Date: |
Sun, 29 Dec 2019 07:46:57 -0500 (EST) |
branch: emacs-27
commit 181f571651bfa5fa82f369e1d02676521ba521dc
Author: Dmitry Gutov <address@hidden>
Commit: Dmitry Gutov <address@hidden>
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'.
---
lisp/progmodes/project.el | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
diff --git a/lisp/progmodes/project.el b/lisp/progmodes/project.el
index 6d6ede7..c96d0a6 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
- emacs-27 updated (012c12a -> 70fe552), Dmitry Gutov, 2019/12/29
- emacs-27 c190e91 1/6: Improve docstrings, Dmitry Gutov, 2019/12/29
- emacs-27 70fe552 6/6: ; xref-references-in-directory: Autoload as well, Dmitry Gutov, 2019/12/29
- emacs-27 65af18d 3/6: Rename xref-collect-references and xref-collect-matches, Dmitry Gutov, 2019/12/29
- emacs-27 181f571 5/6: Fix up requires,
Dmitry Gutov <=
- emacs-27 98788bf 2/6: ; Improve the docstring some more, Dmitry Gutov, 2019/12/29
- emacs-27 43f66c3 4/6: Extract xref-matches-in-files from project--find-regexp-in-files, Dmitry Gutov, 2019/12/29