diff options
| author | Dmitry Gutov | 2019-06-09 17:13:40 +0300 |
|---|---|---|
| committer | Dmitry Gutov | 2019-06-09 17:14:46 +0300 |
| commit | 4f479aeb4b13d640df21b4943beb0935f75b5126 (patch) | |
| tree | 733ef2224ab04285b187c2299f1341c5ef4ba05f | |
| parent | ec563971ecf5d5edde053d965b995a722fe7d79d (diff) | |
| download | emacs-4f479aeb4b13d640df21b4943beb0935f75b5126.tar.gz emacs-4f479aeb4b13d640df21b4943beb0935f75b5126.zip | |
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.
| -rw-r--r-- | lisp/progmodes/xref.el | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/lisp/progmodes/xref.el b/lisp/progmodes/xref.el index 324087f490b..24e2bd04e76 100644 --- a/lisp/progmodes/xref.el +++ b/lisp/progmodes/xref.el | |||
| @@ -423,7 +423,7 @@ value." | |||
| 423 | (set-buffer (marker-buffer marker)) | 423 | (set-buffer (marker-buffer marker)) |
| 424 | (xref--goto-char marker))) | 424 | (xref--goto-char marker))) |
| 425 | 425 | ||
| 426 | (defun xref--pop-to-location (item &optional action) | 426 | (defun xref-pop-to-location (item &optional action) |
| 427 | "Go to the location of ITEM and display the buffer. | 427 | "Go to the location of ITEM and display the buffer. |
| 428 | ACTION controls how the buffer is displayed: | 428 | ACTION controls how the buffer is displayed: |
| 429 | nil -- switch-to-buffer | 429 | nil -- switch-to-buffer |
| @@ -835,8 +835,8 @@ Return an alist of the form ((FILENAME . (XREF ...)) ...)." | |||
| 835 | (let ((xrefs (funcall fetcher))) | 835 | (let ((xrefs (funcall fetcher))) |
| 836 | (cond | 836 | (cond |
| 837 | ((not (cdr xrefs)) | 837 | ((not (cdr xrefs)) |
| 838 | (xref--pop-to-location (car xrefs) | 838 | (xref-pop-to-location (car xrefs) |
| 839 | (assoc-default 'display-action alist))) | 839 | (assoc-default 'display-action alist))) |
| 840 | (t | 840 | (t |
| 841 | (xref--show-xref-buffer fetcher | 841 | (xref--show-xref-buffer fetcher |
| 842 | (cons (cons 'fetched-xrefs xrefs) | 842 | (cons (cons 'fetched-xrefs xrefs) |
| @@ -850,8 +850,8 @@ local keymap that binds `RET' to `xref-quit-and-goto-xref'." | |||
| 850 | (let ((xrefs (funcall fetcher))) | 850 | (let ((xrefs (funcall fetcher))) |
| 851 | (cond | 851 | (cond |
| 852 | ((not (cdr xrefs)) | 852 | ((not (cdr xrefs)) |
| 853 | (xref--pop-to-location (car xrefs) | 853 | (xref-pop-to-location (car xrefs) |
| 854 | (assoc-default 'display-action alist))) | 854 | (assoc-default 'display-action alist))) |
| 855 | (t | 855 | (t |
| 856 | (with-current-buffer (get-buffer-create xref-buffer-name) | 856 | (with-current-buffer (get-buffer-create xref-buffer-name) |
| 857 | (xref--show-common-initialize (xref--analyze xrefs) fetcher alist) | 857 | (xref--show-common-initialize (xref--analyze xrefs) fetcher alist) |