master a1b72008a7: Merge from origin/emacs-28

[Stefan Kangas]

branch: master
commit a1b72008a7228a65af819118d6de620b89d0e0d4
Merge: 1faa1726f0 c09ad0cabd
Author: Stefan Kangas <stefan@marxist.se>
Commit: Stefan Kangas <stefan@marxist.se>

    Merge from origin/emacs-28
    
    c09ad0cabd Fix the bug with duplicate entries in xref output
---
 lisp/progmodes/etags.el | 17 +++++++++--------
 1 file changed, 9 insertions(+), 8 deletions(-)

diff --git a/lisp/progmodes/etags.el b/lisp/progmodes/etags.el
index d7dbaa0650..348160ef50 100644
--- a/lisp/progmodes/etags.el
+++ b/lisp/progmodes/etags.el
@@ -2088,14 +2088,15 @@ file name, add `tag-partial-file-name-match-p' to the 
list value.")
         (definitions (etags--xref-find-definitions symbol))
         same-file-definitions)
     (when (and etags-xref-prefer-current-file file)
-      (cl-delete-if
-       (lambda (definition)
-         (when (equal file
-                      (xref-location-group
-                       (xref-item-location definition)))
-           (push definition same-file-definitions)
-           t))
-       definitions)
+      (setq definitions
+            (cl-delete-if
+             (lambda (definition)
+               (when (equal file
+                            (xref-location-group
+                             (xref-item-location definition)))
+                 (push definition same-file-definitions)
+                 t))
+             definitions))
       (setq definitions (nconc (nreverse same-file-definitions)
                                definitions)))
     definitions))