From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!.POSTED!not-for-mail From: Eli Zaretskii Newsgroups: gmane.emacs.bugs Subject: bug#32034: 26.1; [PACTH] better xref-location-marker for imperfect file locations Date: Mon, 02 Jul 2018 17:47:39 +0300 Message-ID: <83601xlmno.fsf@gnu.org> References: <87y3etsqb7.fsf@gmail.com> NNTP-Posting-Host: blaine.gmane.org Mime-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Trace: blaine.gmane.org 1530542835 16061 195.159.176.226 (2 Jul 2018 14:47:15 GMT) X-Complaints-To: usenet@blaine.gmane.org NNTP-Posting-Date: Mon, 2 Jul 2018 14:47:15 +0000 (UTC) Cc: 32034@debbugs.gnu.org, dgutov@yandex.ru To: joaotavora@gmail.com (=?UTF-8?Q?Jo=C3=A3o_?= =?UTF-8?Q?T=C3=A1vora?=) Original-X-From: bug-gnu-emacs-bounces+geb-bug-gnu-emacs=m.gmane.org@gnu.org Mon Jul 02 16:47:10 2018 Return-path: Envelope-to: geb-bug-gnu-emacs@m.gmane.org Original-Received: from lists.gnu.org ([208.118.235.17]) by blaine.gmane.org with esmtp (Exim 4.84_2) (envelope-from ) id 1fa06g-00044E-1v for geb-bug-gnu-emacs@m.gmane.org; Mon, 02 Jul 2018 16:47:10 +0200 Original-Received: from localhost ([::1]:33259 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fa08n-0003ec-4S for geb-bug-gnu-emacs@m.gmane.org; Mon, 02 Jul 2018 10:49:21 -0400 Original-Received: from eggs.gnu.org ([2001:4830:134:3::10]:37613) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fa08Z-0003aD-0g for bug-gnu-emacs@gnu.org; Mon, 02 Jul 2018 10:49:07 -0400 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1fa08U-0003dN-4g for bug-gnu-emacs@gnu.org; Mon, 02 Jul 2018 10:49:07 -0400 Original-Received: from debbugs.gnu.org ([208.118.235.43]:35769) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1fa08U-0003dJ-09 for bug-gnu-emacs@gnu.org; Mon, 02 Jul 2018 10:49:02 -0400 Original-Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1fa08T-0005NQ-Q0 for bug-gnu-emacs@gnu.org; Mon, 02 Jul 2018 10:49:01 -0400 X-Loop: help-debbugs@gnu.org Resent-From: Eli Zaretskii Original-Sender: "Debbugs-submit" Resent-CC: bug-gnu-emacs@gnu.org Resent-Date: Mon, 02 Jul 2018 14:49:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 32034 X-GNU-PR-Package: emacs X-GNU-PR-Keywords: Original-Received: via spool by 32034-submit@debbugs.gnu.org id=B32034.153054290820628 (code B ref 32034); Mon, 02 Jul 2018 14:49:01 +0000 Original-Received: (at 32034) by debbugs.gnu.org; 2 Jul 2018 14:48:28 +0000 Original-Received: from localhost ([127.0.0.1]:43666 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1fa07w-0005Md-Kq for submit@debbugs.gnu.org; Mon, 02 Jul 2018 10:48:28 -0400 Original-Received: from eggs.gnu.org ([208.118.235.92]:46459) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1fa07v-0005MR-3M for 32034@debbugs.gnu.org; Mon, 02 Jul 2018 10:48:27 -0400 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1fa07i-0003Ka-5K for 32034@debbugs.gnu.org; Mon, 02 Jul 2018 10:48:21 -0400 Original-Received: from fencepost.gnu.org ([2001:4830:134:3::e]:59039) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fa07M-0002pr-RE; Mon, 02 Jul 2018 10:47:52 -0400 Original-Received: from [176.228.60.248] (port=3023 helo=home-c4e4a596f7) by fencepost.gnu.org with esmtpsa (TLS1.2:RSA_AES_256_CBC_SHA1:256) (Exim 4.82) (envelope-from ) id 1fa07M-00012E-7C; Mon, 02 Jul 2018 10:47:52 -0400 In-reply-to: <87y3etsqb7.fsf@gmail.com> (joaotavora@gmail.com) X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 208.118.235.43 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.org@gnu.org Original-Sender: "bug-gnu-emacs" Xref: news.gmane.org gmane.emacs.bugs:148090 Archived-At: > From: joaotavora@gmail.com (João Távora) > Date: Mon, 02 Jul 2018 14:46:52 +0100 > Cc: dgutov@yandex.ru > > The attached patch fixes 1. and 2. It should probably go into emacs-26 > > Then, I'd like to know your opinions on 3., to go into master. > > diff --git a/lisp/progmodes/xref.el b/lisp/progmodes/xref.el > index b0bdd62ae9..d38328cccd 100644ppp > --- a/lisp/progmodes/xref.el > +++ b/lisp/progmodes/xref.el > @@ -119,13 +119,19 @@ xref-make-file-location > (with-current-buffer > (or (get-file-buffer file) > (let ((find-file-suppress-same-file-warnings t)) > + (unless (file-exists-p file) > + (error "File %s doesn't exist!" file)) > (find-file-noselect file))) > (save-restriction > (widen) > (save-excursion > (goto-char (point-min)) > (beginning-of-line line) > - (forward-char column) > + (ignore-errors (forward-char column)) > + (unless (and (= (1+ (current-line)) line) > + (= (current-column) column)) > + (message "Intended xref location was line=%d, column=%d" > + line column)) > (point-marker)))))) What will the last hunk do when a file changed, but the identifier was still found? AFAIR, the etags back-end is capable of doing that (because it searches the file in the vicinity of the line/column if not found at the exact location), and it's a valuable feature, for obvious reasons.