; * xref.el (xref-collect-references): Simplify.

diff --git a/lisp/progmodes/xref.el b/lisp/progmodes/xref.el
index ea705fc852b079f263799aea57526f9c760bd009..099c08045b23fe7e38015a5e870c468f81ae9e3a 100644 (file)
--- a/lisp/progmodes/xref.el
+++ b/lisp/progmodes/xref.el
@@ -689,15 +689,12 @@ tools are used, and when."
          (semantic-symref-tool 'detect)
          (res (semantic-symref-find-references-by-name name 'subdirs))
          (hits (and res (oref res :hit-lines)))
-         (orig-buffers (buffer-list))
-         xrefs)
+         (orig-buffers (buffer-list)))
     (unwind-protect
-        (setq xrefs
-              (mapcar (lambda (hit) (xref--collect-reference hit name))
-                      hits))
+        (delq nil
+              (mapcar (lambda (hit) (xref--collect-reference hit name)) hits))
       (mapc #'kill-buffer
-            (cl-set-difference (buffer-list) orig-buffers)))
-    (delq nil xrefs)))
+            (cl-set-difference (buffer-list) orig-buffers)))))
 
 (defun xref--collect-reference (hit name)
   (pcase-let* ((`(,line . ,file) hit)