From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.io!.POSTED.blaine.gmane.org!not-for-mail From: Dmitry Gutov Newsgroups: gmane.emacs.bugs Subject: bug#52734: 28.0.90; [PATCH] xref-backend-definitions in etags.el duplicates list Date: Fri, 24 Dec 2021 02:27:45 +0200 Message-ID: References: <831r23wupq.fsf@gnu.org> Mime-Version: 1.0 Content-Type: text/plain; charset=utf-8; format=flowed Content-Transfer-Encoding: 7bit Injection-Info: ciao.gmane.io; posting-host="blaine.gmane.org:116.202.254.214"; logging-data="13613"; mail-complaints-to="usenet@ciao.gmane.io" User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:78.0) Gecko/20100101 Thunderbird/78.13.0 Cc: 52734@debbugs.gnu.org To: Eli Zaretskii , David Fussner Original-X-From: bug-gnu-emacs-bounces+geb-bug-gnu-emacs=m.gmane-mx.org@gnu.org Fri Dec 24 01:30:17 2021 Return-path: Envelope-to: geb-bug-gnu-emacs@m.gmane-mx.org Original-Received: from lists.gnu.org ([209.51.188.17]) by ciao.gmane.io with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.92) (envelope-from ) id 1n0YTQ-0003KY-8E for geb-bug-gnu-emacs@m.gmane-mx.org; Fri, 24 Dec 2021 01:30:16 +0100 Original-Received: from localhost ([::1]:49254 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1n0YTP-0007b4-8K for geb-bug-gnu-emacs@m.gmane-mx.org; Thu, 23 Dec 2021 19:30:15 -0500 Original-Received: from eggs.gnu.org ([209.51.188.92]:50678) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1n0YTD-0007ad-R4 for bug-gnu-emacs@gnu.org; Thu, 23 Dec 2021 19:30:04 -0500 Original-Received: from debbugs.gnu.org ([209.51.188.43]:51960) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1n0YTC-0002tY-GD for bug-gnu-emacs@gnu.org; Thu, 23 Dec 2021 19:30:02 -0500 Original-Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1n0YTC-0007nx-DG for bug-gnu-emacs@gnu.org; Thu, 23 Dec 2021 19:30:02 -0500 X-Loop: help-debbugs@gnu.org Resent-From: Dmitry Gutov Original-Sender: "Debbugs-submit" Resent-CC: bug-gnu-emacs@gnu.org Resent-Date: Fri, 24 Dec 2021 00:30:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 52734 X-GNU-PR-Package: emacs X-GNU-PR-Keywords: patch Original-Received: via spool by 52734-submit@debbugs.gnu.org id=B52734.164030574329911 (code B ref 52734); Fri, 24 Dec 2021 00:30:02 +0000 Original-Received: (at 52734) by debbugs.gnu.org; 24 Dec 2021 00:29:03 +0000 Original-Received: from localhost ([127.0.0.1]:35273 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1n0YSF-0007mN-JY for submit@debbugs.gnu.org; Thu, 23 Dec 2021 19:29:03 -0500 Original-Received: from mail-wm1-f43.google.com ([209.85.128.43]:52080) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1n0YSD-0007lp-PJ for 52734@debbugs.gnu.org; Thu, 23 Dec 2021 19:29:02 -0500 Original-Received: by mail-wm1-f43.google.com with SMTP id e5so4259857wmq.1 for <52734@debbugs.gnu.org>; Thu, 23 Dec 2021 16:29:01 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=sender:subject:to:cc:references:from:message-id:date:user-agent :mime-version:in-reply-to:content-language:content-transfer-encoding; bh=rD+xrmWpYxFB9Y3qj0EnQBSkFdvKBq2EmcRi1QzCoak=; b=I4OXZIoJ2YAvZuZmGn3A1qSnwKeKpGvXh7qO1cV9gdQY26dh9Xb/XoTSRTFRMRCQHN db3qKXhKVMjiol1gOqrflC8N990PKR9+PFmSkIOepYJBLSGP5LE6h23VuXbqK7AIJ3gs QMj3U9tQss4uzWSRp6OBXkBw2m3KO/EzyfDJTIiZUTCBzTat496UDIj4cdgTo9Ex55vc C3JbXzRMuBLFZ8xDjvTM+AfY5XWnHtKgVtrumygiMR0yMXxBCaf75OiGGbLuLTWQhMsT HtQw3HVdl0Qh2KoqT6hGnpHxK9V/WWqzYE8If27RpIGRAZVqo4oLmqLJR09jjibrFi0Y 5pww== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:sender:subject:to:cc:references:from:message-id :date:user-agent:mime-version:in-reply-to:content-language :content-transfer-encoding; bh=rD+xrmWpYxFB9Y3qj0EnQBSkFdvKBq2EmcRi1QzCoak=; b=1NmW0xp/5bQrSbEDww8p7cajuDPBfez0BCAzy6bA0h5VYwvXWqp6DCIMdfdbI3q3M/ /LVR7PxA1WW+UNrReH4+Xhq3tcUJNDjc3ADDQSc72ihnqkP94h2p7LoJZBjWDpPqfTT9 1ezPnTGAhAIKXP050nn8biILSMM2bZIGON9YuYrIeS3Xj4cnF05CwGVR7wUPp3AlkiS9 prSP7+wU7hjJPLNlnKVxzXZ+EJKIHOP9jbwqCxae2P09L6ev5Qyb5cgpTR41tQbkxfmd o4z3vdlL/015oJiB4UXKT541EGUO2g+8xjDg2dBcAhqIOdy7jt4leDnIKxmIbUpz9X+O VH7g== X-Gm-Message-State: AOAM533GCeR6ui6OXX8LGXtmKFIyItJNRaZHq3wrzmbp7nqDTaf+7DE4 JHER+VnmETTisF++R4TEdKR/HPNzlmQ= X-Google-Smtp-Source: ABdhPJwl/aQ5ghEn9KgWr0+Z8iQFFR+3gZbFvW0pCoCg72G33vZstfka98LrxjEVe3jg1Cx7/cZVAQ== X-Received: by 2002:a1c:5445:: with SMTP id p5mr3221186wmi.137.1640305736038; Thu, 23 Dec 2021 16:28:56 -0800 (PST) Original-Received: from [192.168.0.6] ([46.251.119.176]) by smtp.googlemail.com with ESMTPSA id m17sm6155733wrw.11.2021.12.23.16.28.55 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Thu, 23 Dec 2021 16:28:55 -0800 (PST) In-Reply-To: <831r23wupq.fsf@gnu.org> Content-Language: en-US X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: bug-gnu-emacs@gnu.org List-Id: "Bug reports for GNU Emacs, the Swiss army knife of text editors" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: bug-gnu-emacs-bounces+geb-bug-gnu-emacs=m.gmane-mx.org@gnu.org Original-Sender: "bug-gnu-emacs" Xref: news.gmane.io gmane.emacs.bugs:223010 Archived-At: Hi Eli, On 23.12.2021 12:12, Eli Zaretskii wrote: > Dmitry, any comments? The patch LGTM, FWIW. How about the patch below instead? And I'd like to apply it to emacs-28. diff --git a/lisp/progmodes/etags.el b/lisp/progmodes/etags.el index f53b09d9e8..a63c3f3397 100644 --- a/lisp/progmodes/etags.el +++ b/lisp/progmodes/etags.el @@ -2084,14 +2084,15 @@ xref-backend-definitions (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))