From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.io!.POSTED.blaine.gmane.org!not-for-mail From: Stephen Leake Newsgroups: gmane.emacs.devel Subject: Re: xref call project-current in correct buffer Date: Tue, 15 Nov 2022 13:37:56 -0800 Message-ID: <86y1sb99vv.fsf@stephe-leake.org> References: <8635ak9hny.fsf@stephe-leake.org> Mime-Version: 1.0 Content-Type: multipart/mixed; boundary="=-=-=" Injection-Info: ciao.gmane.io; posting-host="blaine.gmane.org:116.202.254.214"; logging-data="36436"; mail-complaints-to="usenet@ciao.gmane.io" User-Agent: Gnus/5.13 (Gnus v5.13) To: emacs-devel Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane-mx.org@gnu.org Tue Nov 15 22:39:02 2022 Return-path: Envelope-to: ged-emacs-devel@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 1ov3e0-00098E-3w for ged-emacs-devel@m.gmane-mx.org; Tue, 15 Nov 2022 22:39:00 +0100 Original-Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1ov3dJ-0005Aw-AC; Tue, 15 Nov 2022 16:38:17 -0500 Original-Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1ov3dH-0005AW-AA for emacs-devel@gnu.org; Tue, 15 Nov 2022 16:38:15 -0500 Original-Received: from gproxy2-pub.mail.unifiedlayer.com ([69.89.18.3]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1ov3dF-0003OI-8E for emacs-devel@gnu.org; Tue, 15 Nov 2022 16:38:15 -0500 Original-Received: from cmgw12.mail.unifiedlayer.com (unknown [10.0.90.127]) by progateway4.mail.pro1.eigbox.com (Postfix) with ESMTP id D94B21004937F for ; Tue, 15 Nov 2022 21:37:57 +0000 (UTC) Original-Received: from host2007.hostmonster.com ([67.20.76.71]) by cmsmtp with ESMTP id v3czoP5gXbFxbv3czoPN2A; Tue, 15 Nov 2022 21:37:57 +0000 X-Authority-Reason: nr=8 X-Authority-Analysis: v=2.4 cv=D72Cltdj c=1 sm=1 tr=0 ts=637406b5 a=dWLzHQi6WpdymmZIwiVdBw==:117 a=Fln8i1WyhtedwaIJAdHvmw==:17 a=dLZJa+xiwSxG16/P+YVxDGlgEgI=:19 a=9xFQ1JgjjksA:10:nop_rcvd_month_year a=vvvmwbhNdt4A:10:endurance_base64_authed_username_1 a=j8ZmEajsth7Mnkspg50A:9 a=gsbV30pKscbuOVMdJXwA:9 a=9i_RQKNPAAAA:8 a=a5bdK9N3VBkCh5pF5hUA:9 a=Ev4oQ7kfJBNsvnoXShoW:22 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=stephe-leake.org; s=default; h=Content-Type:MIME-Version:Message-ID:Date: References:In-Reply-To:Subject:To:From:Sender:Reply-To:Cc: Content-Transfer-Encoding:Content-ID:Content-Description:Resent-Date: Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:List-Id: List-Help:List-Unsubscribe:List-Subscribe:List-Post:List-Owner:List-Archive; bh=1Ynpdgg22RKtIa4nzSgrDRjcowr1NyNHhsIDR2Px/Qw=; b=diBiWTklT4VbLul6VOUbWBxsTU MbxRkNjl/wX1+Kn5WOX+fGHqgLPEpUaKIW2HG6z/880rdMMNhiAh+awOXFTCXNAQ8C4ZgR5dxRw1K 0tE/wBjEQDwyjsyjm6rwT5uE9ccI1nRsUYlPn1fVfspjie1EgOQ+8xhfUtg1Hc180nC6ihRWBQtoF Trqy94xBm8B8aNRt+E+TPrClI+d4KTD1Numd9881hhi1bIZqu3M2yG7jmC4eEqKJDm3iWzBW/L/yF s88ltL6JNX/rcWVaG9QjMvFifP0XGrqOtlktw5ZLZnhybcv4l2kCOKDowWEhIvGgtf2eLGbh8YPPi MjOl4UFA==; Original-Received: from 135-180-197-170.fiber.dynamic.sonic.net ([135.180.197.170]:64567 helo=DESKTOP-G20DCG1) by host2007.hostmonster.com with esmtpsa (TLS1.2) tls TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384 (Exim 4.95) (envelope-from ) id 1ov3cz-001Yx7-E2 for emacs-devel@gnu.org; Tue, 15 Nov 2022 14:37:57 -0700 In-Reply-To: <8635ak9hny.fsf@stephe-leake.org> (Stephen Leake's message of "Tue, 15 Nov 2022 10:49:53 -0800") X-AntiAbuse: This header was added to track abuse, please include it with any abuse report X-AntiAbuse: Primary Hostname - host2007.hostmonster.com X-AntiAbuse: Original Domain - gnu.org X-AntiAbuse: Originator/Caller UID/GID - [47 12] / [47 12] X-AntiAbuse: Sender Address Domain - stephe-leake.org X-BWhitelist: no X-Source-IP: 135.180.197.170 X-Source-L: No X-Exim-ID: 1ov3cz-001Yx7-E2 X-Source-Sender: 135-180-197-170.fiber.dynamic.sonic.net (DESKTOP-G20DCG1) [135.180.197.170]:64567 X-Source-Auth: stephen_leake@stephe-leake.org X-Email-Count: 1 X-Source-Cap: c3RlcGhlbGU7c3RlcGhlbGU7aG9zdDIwMDcuaG9zdG1vbnN0ZXIuY29t X-Local-Domain: yes Received-SPF: pass client-ip=69.89.18.3; envelope-from=stephen_leake@stephe-leake.org; helo=gproxy2-pub.mail.unifiedlayer.com X-Spam_score_int: 16 X-Spam_score: 1.6 X-Spam_bar: + X-Spam_report: (1.6 / 5.0 requ) BAYES_00=-1.9, DKIM_INVALID=0.1, DKIM_SIGNED=0.1, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_H2=-0.001, RCVD_IN_SBL_CSS=3.335, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=no autolearn_force=no X-Spam_action: no action X-BeenThere: emacs-devel@gnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: "Emacs development discussions." List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: emacs-devel-bounces+ged-emacs-devel=m.gmane-mx.org@gnu.org Original-Sender: emacs-devel-bounces+ged-emacs-devel=m.gmane-mx.org@gnu.org Xref: news.gmane.io gmane.emacs.devel:299886 Archived-At: --=-=-= Content-Type: text/plain Actually attach the patch --=-=-= Content-Type: text/x-patch Content-Disposition: inline; filename=xref.diff diff --git a/lisp/progmodes/xref.el b/lisp/progmodes/xref.el index bb36688ef8..2d73ab82b8 100644 --- a/lisp/progmodes/xref.el +++ b/lisp/progmodes/xref.el @@ -1243,10 +1243,14 @@ xref-show-definitions-buffer-at-bottom (xref-pop-to-location (car xrefs) (assoc-default 'display-action alist))) (t + ;; xref--analyze uses (project-current), so it must be done in + ;; the original buffer. + (setq xrefs (xref--analyze xrefs)) + (with-current-buffer (get-buffer-create xref-buffer-name) (xref--ensure-default-directory dd (current-buffer)) (xref--transient-buffer-mode) - (xref--show-common-initialize (xref--analyze xrefs) fetcher alist) + (xref--show-common-initialize xrefs fetcher alist) (pop-to-buffer (current-buffer) `(display-buffer-in-direction . ((direction . below) (window-height . ,size-fun)))) --=-=-= Content-Type: text/plain Stephen Leake writes: > I ran into a situation where xref failed because > xref-show-definitions-buffer-at-bottom calls project-current in the > *xref* buffer, not the original source buffer, and the project in that > buffer is different from the one in the *xref* buffer. > > The attached patch fixes it, but there are other possible ways to do it; > pass the project to xref--analyze, or set a local variable containing > the project. > > In addition, refresh-buffer in the *xref* buffer will have the same > problem, so setting the original project in a local variable might be > the best way. -- -- Stephe --=-=-=--