[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
master f735eb96281: xref.el: Ensure that the return value is the buffer
From: |
Dmitry Gutov |
Subject: |
master f735eb96281: xref.el: Ensure that the return value is the buffer |
Date: |
Fri, 1 Sep 2023 21:59:59 -0400 (EDT) |
branch: master
commit f735eb962815be2e62d4b876963baa744f65139d
Author: Dmitry Gutov <dmitry@gutov.dev>
Commit: Dmitry Gutov <dmitry@gutov.dev>
xref.el: Ensure that the return value is the buffer
* lisp/progmodes/xref.el (xref--show-xrefs, xref--show-defs):
Ensure the return value of the funcall is returned (bug#65631).
---
lisp/progmodes/xref.el | 22 ++++++++++++----------
1 file changed, 12 insertions(+), 10 deletions(-)
diff --git a/lisp/progmodes/xref.el b/lisp/progmodes/xref.el
index 9b64ef4de10..b7bfb192d87 100644
--- a/lisp/progmodes/xref.el
+++ b/lisp/progmodes/xref.el
@@ -1480,20 +1480,22 @@ The meanings of both arguments are the same as
documented in
(setq xrefs 'called-already)))))))
(let ((cb (current-buffer))
(pt (point)))
- (funcall xref-show-xrefs-function fetcher
- `((window . ,(selected-window))
- (display-action . ,display-action)
- (auto-jump . ,xref-auto-jump-to-first-xref)))
- (xref--push-markers cb pt)))
+ (prog1
+ (funcall xref-show-xrefs-function fetcher
+ `((window . ,(selected-window))
+ (display-action . ,display-action)
+ (auto-jump . ,xref-auto-jump-to-first-xref)))
+ (xref--push-markers cb pt))))
(defun xref--show-defs (xrefs display-action)
(let ((cb (current-buffer))
(pt (point)))
- (funcall xref-show-definitions-function xrefs
- `((window . ,(selected-window))
- (display-action . ,display-action)
- (auto-jump . ,xref-auto-jump-to-first-definition)))
- (xref--push-markers cb pt)))
+ (prog1
+ (funcall xref-show-definitions-function xrefs
+ `((window . ,(selected-window))
+ (display-action . ,display-action)
+ (auto-jump . ,xref-auto-jump-to-first-definition)))
+ (xref--push-markers cb pt))))
(defun xref--push-markers (buf pt)
(when (buffer-live-p buf)
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- master f735eb96281: xref.el: Ensure that the return value is the buffer,
Dmitry Gutov <=