From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!.POSTED.blaine.gmane.org!not-for-mail From: Dmitry Gutov Newsgroups: gmane.emacs.bugs Subject: bug#34908: Push mark in xref-push-marker-stack Date: Wed, 20 Mar 2019 03:47:32 +0200 Message-ID: References: <87h8bz29ht.fsf@mail.linkov.net> <871s32h91o.fsf@mail.linkov.net> Mime-Version: 1.0 Content-Type: text/plain; charset=utf-8; format=flowed Content-Transfer-Encoding: 7bit Injection-Info: blaine.gmane.org; posting-host="blaine.gmane.org:195.159.176.226"; logging-data="131108"; mail-complaints-to="usenet@blaine.gmane.org" User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:60.0) Gecko/20100101 Thunderbird/60.5.1 Cc: 34908@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.org@gnu.org Wed Mar 20 02:53:11 2019 Return-path: Envelope-to: geb-bug-gnu-emacs@m.gmane.org Original-Received: from lists.gnu.org ([209.51.188.17]) by blaine.gmane.org with esmtps (TLS1.0:RSA_AES_256_CBC_SHA1:256) (Exim 4.89) (envelope-from ) id 1h6QPn-000Y0j-6g for geb-bug-gnu-emacs@m.gmane.org; Wed, 20 Mar 2019 02:53:11 +0100 Original-Received: from localhost ([127.0.0.1]:41091 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1h6QPm-0001jq-5f for geb-bug-gnu-emacs@m.gmane.org; Tue, 19 Mar 2019 21:53:10 -0400 Original-Received: from eggs.gnu.org ([209.51.188.92]:42857) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1h6QPX-0001dD-TJ for bug-gnu-emacs@gnu.org; Tue, 19 Mar 2019 21:52:58 -0400 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1h6QKw-0004L7-V9 for bug-gnu-emacs@gnu.org; Tue, 19 Mar 2019 21:48:12 -0400 Original-Received: from debbugs.gnu.org ([209.51.188.43]:37541) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1h6QKo-0004A1-Mw for bug-gnu-emacs@gnu.org; Tue, 19 Mar 2019 21:48:08 -0400 Original-Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1h6QKo-00046J-Hp for bug-gnu-emacs@gnu.org; Tue, 19 Mar 2019 21:48:02 -0400 X-Loop: help-debbugs@gnu.org Resent-From: Dmitry Gutov Original-Sender: "Debbugs-submit" Resent-CC: bug-gnu-emacs@gnu.org Resent-Date: Wed, 20 Mar 2019 01:48:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 34908 X-GNU-PR-Package: emacs Original-Received: via spool by 34908-submit@debbugs.gnu.org id=B34908.155304646515736 (code B ref 34908); Wed, 20 Mar 2019 01:48:02 +0000 Original-Received: (at 34908) by debbugs.gnu.org; 20 Mar 2019 01:47:45 +0000 Original-Received: from localhost ([127.0.0.1]:51085 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1h6QKX-00045k-FH for submit@debbugs.gnu.org; Tue, 19 Mar 2019 21:47:45 -0400 Original-Received: from mail-lj1-f178.google.com ([209.85.208.178]:37024) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1h6QKV-00045U-3t for 34908@debbugs.gnu.org; Tue, 19 Mar 2019 21:47:43 -0400 Original-Received: by mail-lj1-f178.google.com with SMTP id v13so812745ljk.4 for <34908@debbugs.gnu.org>; Tue, 19 Mar 2019 18:47:42 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=sender:subject:to:cc:references:from:message-id:date:user-agent :mime-version:in-reply-to:content-language:content-transfer-encoding; bh=0OU28F+REpK5AojrBXITaMZA2D1/xqG6Q8TyiaNDY6A=; b=oE0kklPzUDUbSQVVFNa3sBR0RlgGI0xFXgR5++Hgni3m1eB7r8jPpunVPpJYErFv+Y y45PReHYundkJi53toG5UUfsxMXDyCBIJNdYjHbZ4RaVRTIa9aaxP5g1tj0v8x/FZ7Ri XRGJlNeZxhaxWnB1aEZNATFYjJ85EVqNZxYCWYuOnqfDlIsZl5sekWN4QsjnHqHPhHnY +/AswIm1G9cHiwWCOcCOqMSIEPAUPigGRNdbYQRB5LMYi4kSr/qvbc6ivxsF5Y8pyOgH RtYkJN3Jdm5DNhc+cmTNfwk2eUxToKZOYyAS8YviB6jMRffYNYf0Bi7QGk3mSBoT8xO7 EHNA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; 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=0OU28F+REpK5AojrBXITaMZA2D1/xqG6Q8TyiaNDY6A=; b=DwMqvqIUjD6lmh8+B5OP4vgL8vDbm5XHlQDrjBhHs9irHQEZizRvDSSU15OmVPL9TC AypAOWNwcWdWw9Z80P1UhDkJWq9qOj+p98SclR8sc+JFR/Z2oPsMyQfCUy3rfk1E1AoD evcp125g4t2hzd48GiKZy/ohE7KSArD+kyubYmA6SaykvhSmfgYGnS+vZxL69yBTJbay dGsmy01S8C23MhZzyQXaeUI83lD7hFbbkpzJD02tNkXziL6g545lpPu1KDgB3IEwICoC qV04cNdDKOjAgCBMNHVNQ5bxm1MCPKn7tsDjCSW4QQtstCZXWv0T28VlMqyGe083zCSv sHLw== X-Gm-Message-State: APjAAAUT/nfrLV9c7RMHDgeAYMpehcsoAIJQ+2qmUXjszHWTOAOVWKBM X6hW5/f7I37dK6cdQ9G9ipY= X-Google-Smtp-Source: APXvYqwVMG0ffg0ohDu7e1Sqyiaamojh4NK+rsUrMHuKinHAbV5piNIf5uqdPLZmc8jH7xQe2aNIfw== X-Received: by 2002:a2e:6309:: with SMTP id x9mr15241079ljb.75.1553046456158; Tue, 19 Mar 2019 18:47:36 -0700 (PDT) Original-Received: from [192.168.1.3] ([185.105.174.23]) by smtp.googlemail.com with ESMTPSA id u26sm91203lfi.41.2019.03.19.18.47.34 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 19 Mar 2019 18:47:35 -0700 (PDT) In-Reply-To: <871s32h91o.fsf@mail.linkov.net> Content-Language: en-US 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: 209.51.188.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:156527 Archived-At: On 19.03.2019 23:02, Juri Linkov wrote: > Yes, its inconvenience is that you have to remember whether a previous > position was in the same file or not, and depending on this decide > what command to use: global or local pop. Sooner or later, I believe we should rethink that UI. >> Even so, I think it's been nice enough that every command can choose >> whether it pushes the mark to the local/global buffer rights, and/or it >> adds it to the xref marker stack. Do we have any particular guidelines in >> the manual for when either should happen? > > I think it should push to both. OK. > I'm not sure where to call push-mark: closer to the command, > or closer to ring-insert. It seems a suitable place for > push-mark is in xref-push-marker-stack as its name suggests. I'd rather have a more localized change, at least for now. And leave xref-push-marker-stack to only modify its own data structure. So how about this? diff --git a/lisp/progmodes/xref.el b/lisp/progmodes/xref.el index 6974d00048..015ea16f34 100644 --- a/lisp/progmodes/xref.el +++ b/lisp/progmodes/xref.el @@ -797,6 +797,7 @@ xref--read-identifier-history (defvar xref--read-pattern-history nil) (defun xref--show-xrefs (xrefs display-action &optional always-show-list) + (push-mark nil t) (cond ((and (not (cdr xrefs)) (not always-show-list)) (xref-push-marker-stack)