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#65578: Eglot with mouse Date: Mon, 28 Aug 2023 20:00:12 +0300 Message-ID: <06ccb99d-27e5-179d-f34e-3ce64f92879d@gutov.dev> References: <86zg2beibp.fsf@mail.linkov.net> <402f3c93-748b-62d3-593f-4b852839deae@gutov.dev> <86o7irce5h.fsf@mail.linkov.net> 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="25376"; mail-complaints-to="usenet@ciao.gmane.io" User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:102.0) Gecko/20100101 Thunderbird/102.13.0 Cc: 65578@debbugs.gnu.org, =?UTF-8?Q?Jo=C3=A3o_?= =?UTF-8?Q?T=C3=A1vora?= To: Juri Linkov Original-X-From: bug-gnu-emacs-bounces+geb-bug-gnu-emacs=m.gmane-mx.org@gnu.org Mon Aug 28 19:01:35 2023 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 1qafcM-0006Oq-RH for geb-bug-gnu-emacs@m.gmane-mx.org; Mon, 28 Aug 2023 19:01:35 +0200 Original-Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1qafbu-0000mZ-74; Mon, 28 Aug 2023 13:01:06 -0400 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 1qafbj-0000jY-Tg for bug-gnu-emacs@gnu.org; Mon, 28 Aug 2023 13:00:55 -0400 Original-Received: from debbugs.gnu.org ([2001:470:142:5::43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1qafbj-00031C-Lu for bug-gnu-emacs@gnu.org; Mon, 28 Aug 2023 13:00:55 -0400 Original-Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1qafbp-0003LY-R0 for bug-gnu-emacs@gnu.org; Mon, 28 Aug 2023 13:01:01 -0400 X-Loop: help-debbugs@gnu.org Resent-From: Dmitry Gutov Original-Sender: "Debbugs-submit" Resent-CC: bug-gnu-emacs@gnu.org Resent-Date: Mon, 28 Aug 2023 17:01:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 65578 X-GNU-PR-Package: emacs Original-Received: via spool by 65578-submit@debbugs.gnu.org id=B65578.169324203212811 (code B ref 65578); Mon, 28 Aug 2023 17:01:01 +0000 Original-Received: (at 65578) by debbugs.gnu.org; 28 Aug 2023 17:00:32 +0000 Original-Received: from localhost ([127.0.0.1]:48946 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qafbL-0003KZ-IH for submit@debbugs.gnu.org; Mon, 28 Aug 2023 13:00:31 -0400 Original-Received: from wout1-smtp.messagingengine.com ([64.147.123.24]:35737) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qafbI-0003KG-9A for 65578@debbugs.gnu.org; Mon, 28 Aug 2023 13:00:29 -0400 Original-Received: from compute1.internal (compute1.nyi.internal [10.202.2.41]) by mailout.west.internal (Postfix) with ESMTP id C62E43200D56; Mon, 28 Aug 2023 13:00:15 -0400 (EDT) Original-Received: from mailfrontend2 ([10.202.2.163]) by compute1.internal (MEProxy); Mon, 28 Aug 2023 13:00:16 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gutov.dev; h=cc :cc:content-transfer-encoding:content-type:content-type:date :date:from:from:in-reply-to:in-reply-to:message-id:mime-version :references:reply-to:sender:subject:subject:to:to; s=fm3; t= 1693242015; x=1693328415; bh=/8u5u/fC8mndy2SN8f3WhTqe7BkfxP2KmbM fUZDhrhg=; b=F/aCL7Hzwpmd5YHA+lmtGyDBYabLALHASQ/g5mLGMfIO2H1BW23 TXRNOiiU50FDm3mJ4DxTQVdycaK0pQQXhAmCWBl0hH2mM4TkcBJZ8dGwH6UPCsIg yweuiAl3tWoN1GYZvJVqmLHt3FNWYv6Fu5UpWb3f89cqUuzQmFOmEkPXxY6ROZsa rB/twMZkiB8O3BQUpJ0X4EoZLx9NzM1D/eRfLanECCvU12OaiT3cPrGaLlscRxod Cwr7SXK2nAu+BGVfy61bzsJPzwT7rB8l/mC68Poe2okNQ4YFwe4ufVGJMKljr3+9 Hx3tyTJ8yXeOs6qCwJGV4RYMsn6Dgm4Xcdw== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d= messagingengine.com; h=cc:cc:content-transfer-encoding :content-type:content-type:date:date:feedback-id:feedback-id :from:from:in-reply-to:in-reply-to:message-id:mime-version :references:reply-to:sender:subject:subject:to:to:x-me-proxy :x-me-proxy:x-me-sender:x-me-sender:x-sasl-enc; s=fm1; t= 1693242015; x=1693328415; bh=/8u5u/fC8mndy2SN8f3WhTqe7BkfxP2KmbM fUZDhrhg=; b=GB0L9QGnPUbFfyfOEFKa22yRDPcBJb6cx2NB1oQNQLrqRQljkiA ereNwbfO7mUZ0LU+POEkFNxpru6pfZcZzR9lIfR3/gohl4xkjm2rO5doywpYZrgB vqqHZNiL3ZBm82/8hnyCNeo4+GKrisrkVxkt3jCwktlIOweFGmazONS6bQbkWilz IktG/83ATPse4YF9Cnevn33vqs/7B9o7HfozoTQ3YhbFCldysMmzETlEI7lmdT/0 XDpURVS+60qsbXVR6hwRZpp69dMlkKpQyB8KJwxr0ciW/J0NzZRwo4AjN1ajLQSh VlMVhttkESS7lEj+FQFoZvVPwWERFkka+Gw== X-ME-Sender: X-ME-Received: X-ME-Proxy-Cause: gggruggvucftvghtrhhoucdtuddrgedviedrudefgedguddtiecutefuodetggdotefrod ftvfcurfhrohhfihhlvgemucfhrghsthforghilhdpqfgfvfdpuffrtefokffrpgfnqfgh necuuegrihhlohhuthemuceftddtnecusecvtfgvtghiphhivghnthhsucdlqddutddtmd enucfjughrpefkffggfgfuvfevfhfhjggtgfesthejredttdefjeenucfhrhhomhepffhm ihhtrhihucfiuhhtohhvuceoughmihhtrhihsehguhhtohhvrdguvghvqeenucggtffrrg htthgvrhhnpeeigfetveehveevffehledtueekieeikeeufeegudfgfeeghfdulefgfeev ledvveenucevlhhushhtvghrufhiiigvpedtnecurfgrrhgrmhepmhgrihhlfhhrohhmpe gumhhithhrhiesghhuthhovhdruggvvh X-ME-Proxy: Feedback-ID: i0e71465a:Fastmail Original-Received: by mail.messagingengine.com (Postfix) with ESMTPA; Mon, 28 Aug 2023 13:00:13 -0400 (EDT) Content-Language: en-US In-Reply-To: <86o7irce5h.fsf@mail.linkov.net> 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-bounces+geb-bug-gnu-emacs=m.gmane-mx.org@gnu.org Xref: news.gmane.io gmane.emacs.bugs:268644 Archived-At: On 28/08/2023 19:42, Juri Linkov wrote: >>> xref-find-definitions-at-mouse uses save-excursion with >>> mouse-set-point before calling xref-backend-identifier-at-point. >>> But the same save-excursion with mouse-set-point can't be added >>> around xref-find-definitions because save-excursion will restore >>> the original position after visiting the found identifier. >> Could we do that without additional save-excursion? >> >> diff --git a/lisp/progmodes/xref.el b/lisp/progmodes/xref.el >> index 0666b18cba1..0c3e34fe0a5 100644 >> --- a/lisp/progmodes/xref.el >> +++ b/lisp/progmodes/xref.el >> @@ -1637,7 +1637,9 @@ xref-find-definitions-at-mouse >> (mouse-set-point event) >> (xref-backend-identifier-at-point (xref-find-backend))))) >> (if identifier >> - (xref-find-definitions identifier) >> + (progn >> + (mouse-set-point event) >> + (xref-find-definitions identifier)) >> (user-error "No identifier here")))) > The problem with this solution is that when it doesn't find > the identifier then it leaves point at the wrong place. I'm not sure is a big problem, but we could save the original position and restore it in case of error too: diff --git a/lisp/progmodes/xref.el b/lisp/progmodes/xref.el index 0666b18cba1..fb7380dee77 100644 --- a/lisp/progmodes/xref.el +++ b/lisp/progmodes/xref.el @@ -1635,9 +1635,18 @@ xref-find-definitions-at-mouse (let ((identifier (save-excursion (mouse-set-point event) - (xref-backend-identifier-at-point (xref-find-backend))))) + (xref-backend-identifier-at-point (xref-find-backend)))) + (buf (current-buffer)) + (pos (point))) (if identifier - (xref-find-definitions identifier) + (condition-case err + (progn + (mouse-set-point event) + (xref-find-definitions identifier)) + (user-error + (set-buffer buf) + (goto-char pos) + (user-error (message (error-message-string err))))) (user-error "No identifier here")))) ;;;###autoload