[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Emacs-diffs] emacs-25 1a3c454 2/2: Update project-find-regexp for the n
From: |
Dmitry Gutov |
Subject: |
[Emacs-diffs] emacs-25 1a3c454 2/2: Update project-find-regexp for the new xref API |
Date: |
Sun, 15 Nov 2015 04:33:36 +0000 |
branch: emacs-25
commit 1a3c4541c3ddf4de0afce339f4ea9bf04c805fa8
Author: Dmitry Gutov <address@hidden>
Commit: Dmitry Gutov <address@hidden>
Update project-find-regexp for the new xref API
* lisp/progmodes/project.el (project--read-regexp):
Update to use the new xref API methods.
* lisp/progmodes/xref.el (xref-find-backend): Autoload.
---
lisp/progmodes/project.el | 5 ++---
lisp/progmodes/xref.el | 1 +
2 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/lisp/progmodes/project.el b/lisp/progmodes/project.el
index 398339e..40d7e03 100644
--- a/lisp/progmodes/project.el
+++ b/lisp/progmodes/project.el
@@ -213,6 +213,7 @@ DIRS must contain directory names."
(declare-function grep-read-files "grep")
(declare-function xref-collect-matches "xref")
(declare-function xref--show-xrefs "xref")
+(declare-function xref-backend-identifier-at-point "xref")
;;;###autoload
(defun project-find-regexp (regexp)
@@ -240,10 +241,8 @@ pattern to search for."
(project--find-regexp-in dirs regexp pr)))
(defun project--read-regexp ()
- (defvar xref-identifier-at-point-function)
- (require 'xref)
(read-regexp "Find regexp"
- (funcall xref-identifier-at-point-function)))
+ (xref-backend-identifier-at-point (xref-find-backend))))
(defun project--find-regexp-in (dirs regexp project)
(require 'grep)
diff --git a/lisp/progmodes/xref.el b/lisp/progmodes/xref.el
index 7e3b560..40f8d23 100644
--- a/lisp/progmodes/xref.el
+++ b/lisp/progmodes/xref.el
@@ -210,6 +210,7 @@ and should return either nil to mean that it is not
applicable,
or an xref backend, which is a value to be used to dispatch the
generic functions.")
+;;;###autoload
(defun xref-find-backend ()
(run-hook-with-args-until-success 'xref-backend-functions))