[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Emacs-diffs] master 4f479ae 2/2: Rename xref--pop-to-location to xref-p
From: |
Dmitry Gutov |
Subject: |
[Emacs-diffs] master 4f479ae 2/2: Rename xref--pop-to-location to xref-pop-to-location |
Date: |
Sun, 9 Jun 2019 10:18:39 -0400 (EDT) |
branch: master
commit 4f479aeb4b13d640df21b4943beb0935f75b5126
Author: Dmitry Gutov <address@hidden>
Commit: Dmitry Gutov <address@hidden>
Rename xref--pop-to-location to xref-pop-to-location
* lisp/progmodes/xref.el (xref-pop-to-location):
Rename from xref-pop-to-location. So that third-party
xref-show-definitions-function implementations can use it safely
(bug#36144). Update all callers.
---
lisp/progmodes/xref.el | 10 +++++-----
1 file changed, 5 insertions(+), 5 deletions(-)
diff --git a/lisp/progmodes/xref.el b/lisp/progmodes/xref.el
index 324087f..24e2bd0 100644
--- a/lisp/progmodes/xref.el
+++ b/lisp/progmodes/xref.el
@@ -423,7 +423,7 @@ value."
(set-buffer (marker-buffer marker))
(xref--goto-char marker)))
-(defun xref--pop-to-location (item &optional action)
+(defun xref-pop-to-location (item &optional action)
"Go to the location of ITEM and display the buffer.
ACTION controls how the buffer is displayed:
nil -- switch-to-buffer
@@ -835,8 +835,8 @@ Return an alist of the form ((FILENAME . (XREF ...)) ...)."
(let ((xrefs (funcall fetcher)))
(cond
((not (cdr xrefs))
- (xref--pop-to-location (car xrefs)
- (assoc-default 'display-action alist)))
+ (xref-pop-to-location (car xrefs)
+ (assoc-default 'display-action alist)))
(t
(xref--show-xref-buffer fetcher
(cons (cons 'fetched-xrefs xrefs)
@@ -850,8 +850,8 @@ local keymap that binds `RET' to `xref-quit-and-goto-xref'."
(let ((xrefs (funcall fetcher)))
(cond
((not (cdr xrefs))
- (xref--pop-to-location (car xrefs)
- (assoc-default 'display-action alist)))
+ (xref-pop-to-location (car xrefs)
+ (assoc-default 'display-action alist)))
(t
(with-current-buffer (get-buffer-create xref-buffer-name)
(xref--show-common-initialize (xref--analyze xrefs) fetcher alist)