From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.io!.POSTED.blaine.gmane.org!not-for-mail From: Juri Linkov Newsgroups: gmane.emacs.bugs Subject: bug#71466: 30.0.50; Buffer-menu-group-by non-nil resets point when Buffer List is reverted Date: Mon, 17 Jun 2024 19:31:01 +0300 Organization: LINKOV.NET Message-ID: <86wmmny1iy.fsf@mail.linkov.net> References: <86tthzwgsw.fsf@mail.linkov.net> <86msnkyt7c.fsf@mail.linkov.net> 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="30902"; mail-complaints-to="usenet@ciao.gmane.io" User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/30.0.50 (x86_64-pc-linux-gnu) Cc: 71466@debbugs.gnu.org, Eshel Yaron To: Dmitry Gutov Original-X-From: bug-gnu-emacs-bounces+geb-bug-gnu-emacs=m.gmane-mx.org@gnu.org Mon Jun 17 18:35:16 2024 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 1sJFK8-0007qW-3T for geb-bug-gnu-emacs@m.gmane-mx.org; Mon, 17 Jun 2024 18:35:16 +0200 Original-Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1sJFJt-00021U-Ux; Mon, 17 Jun 2024 12:35:01 -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 1sJFJs-000211-8b for bug-gnu-emacs@gnu.org; Mon, 17 Jun 2024 12:35:00 -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 1sJFJr-0005IM-Vk for bug-gnu-emacs@gnu.org; Mon, 17 Jun 2024 12:35:00 -0400 Original-Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1sJFJu-0002YY-1V for bug-gnu-emacs@gnu.org; Mon, 17 Jun 2024 12:35:02 -0400 X-Loop: help-debbugs@gnu.org Resent-From: Juri Linkov Original-Sender: "Debbugs-submit" Resent-CC: bug-gnu-emacs@gnu.org Resent-Date: Mon, 17 Jun 2024 16:35:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 71466 X-GNU-PR-Package: emacs Original-Received: via spool by 71466-submit@debbugs.gnu.org id=B71466.17186420899800 (code B ref 71466); Mon, 17 Jun 2024 16:35:02 +0000 Original-Received: (at 71466) by debbugs.gnu.org; 17 Jun 2024 16:34:49 +0000 Original-Received: from localhost ([127.0.0.1]:35235 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1sJFJg-0002Xy-OG for submit@debbugs.gnu.org; Mon, 17 Jun 2024 12:34:49 -0400 Original-Received: from relay2-d.mail.gandi.net ([217.70.183.194]:56239) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1sJFJf-0002Xm-Jl for 71466@debbugs.gnu.org; Mon, 17 Jun 2024 12:34:48 -0400 Original-Received: by mail.gandi.net (Postfix) with ESMTPSA id B505140005; Mon, 17 Jun 2024 16:34:15 +0000 (UTC) In-Reply-To: (Dmitry Gutov's message of "Mon, 17 Jun 2024 15:32:14 +0300") X-GND-Sasl: juri@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:287405 Archived-At: --=-=-= Content-Type: text/plain >> +(defun xref-revert-buffer-restore-point () >> + (let ((current-line (buffer-substring-no-properties (pos-bol) (pos-eol)))) >> + (lambda () >> + (goto-char (point-min)) >> + (when (search-forward current-line) >> + (goto-char (pos-bol)))))) > > Perhaps it would make sense to save the current group as well, for > additional precision. Ok, so this is implemented here: --=-=-= Content-Type: text/x-diff Content-Disposition: inline; filename=xref-revert-buffer-restore-point_2.patch diff --git a/lisp/progmodes/xref.el b/lisp/progmodes/xref.el index fb6c9dad73b..987571b92c5 100644 --- a/lisp/progmodes/xref.el +++ b/lisp/progmodes/xref.el @@ -1017,7 +1017,9 @@ xref--xref-buffer-mode (lambda (&optional bound move backward looking-at) (outline-search-text-property 'xref-group nil bound move backward looking-at))) - (setq-local outline-level (lambda () 1))) + (setq-local outline-level (lambda () 1)) + (add-hook 'revert-buffer-restore-functions + #'xref-revert-buffer-restore-point nil t)) (defvar xref--transient-buffer-mode-map (let ((map (make-sparse-keymap))) @@ -1309,6 +1311,24 @@ xref--auto-jump-first ((eq value 'move) (forward-line 1)))) +(defun xref-revert-buffer-restore-point () + (let* ((item + (when (xref--item-at-point) + (buffer-substring-no-properties (pos-bol) (pos-eol)))) + (group + (save-excursion + (when (or (get-text-property (point) 'xref-group) + (and item (xref--search-property 'xref-group t) + (get-text-property (point) 'xref-group))) + (buffer-substring-no-properties (pos-bol) (pos-eol)))))) + (when (or item group) + (lambda () + (goto-char (point-min)) + (when (and group (search-forward (concat "\n" group "\n") nil t)) + (goto-char (pos-bol 0))) + (when (and item (search-forward (concat "\n" item "\n") nil t)) + (goto-char (pos-bol 0))))))) + (defun xref-show-definitions-buffer (fetcher alist) "Show the definitions list in a regular window. --=-=-=--