From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.io!.POSTED.blaine.gmane.org!not-for-mail From: Eshel Yaron via "Bug reports for GNU Emacs, the Swiss army knife of text editors" Newsgroups: gmane.emacs.bugs Subject: bug#71466: 30.0.50; Buffer-menu-group-by non-nil resets point when Buffer List is reverted Date: Wed, 26 Jun 2024 18:56:53 +0200 Message-ID: References: <86tthzwgsw.fsf@mail.linkov.net> <86msnkyt7c.fsf@mail.linkov.net> <30404984-e7ac-4f92-a194-06438dbf2d03@gutov.dev> <867cemquey.fsf@gnu.org> <864j9qqpfx.fsf@gnu.org> <86tthqp2zc.fsf@gnu.org> <86tthnzp19.fsf@mail.linkov.net> <10881a4d-5b44-4b7e-9686-d6f7bf3ddace@gutov.dev> <86r0cmg9wf.fsf@mail.linkov.net> <86tthh9o8f.fsf@gnu.org> <865xtw9caa.fsf@gnu.org> Reply-To: Eshel Yaron 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="40262"; mail-complaints-to="usenet@ciao.gmane.io" User-Agent: Gnus/5.13 (Gnus v5.13) Cc: Dmitry Gutov , 71466@debbugs.gnu.org, juri@linkov.net To: Eli Zaretskii Original-X-From: bug-gnu-emacs-bounces+geb-bug-gnu-emacs=m.gmane-mx.org@gnu.org Wed Jun 26 18:58:19 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 1sMVyN-000AGJ-2u for geb-bug-gnu-emacs@m.gmane-mx.org; Wed, 26 Jun 2024 18:58:19 +0200 Original-Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1sMVy5-00032Y-FP; Wed, 26 Jun 2024 12:58: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 1sMVy4-00031u-Ci for bug-gnu-emacs@gnu.org; Wed, 26 Jun 2024 12:58: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 1sMVy4-0005ig-4m for bug-gnu-emacs@gnu.org; Wed, 26 Jun 2024 12:58:00 -0400 Original-Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1sMVy6-0003Hl-AW for bug-gnu-emacs@gnu.org; Wed, 26 Jun 2024 12:58:02 -0400 X-Loop: help-debbugs@gnu.org Resent-From: Eshel Yaron Original-Sender: "Debbugs-submit" Resent-CC: bug-gnu-emacs@gnu.org Resent-Date: Wed, 26 Jun 2024 16:58: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.171942102212553 (code B ref 71466); Wed, 26 Jun 2024 16:58:02 +0000 Original-Received: (at 71466) by debbugs.gnu.org; 26 Jun 2024 16:57:02 +0000 Original-Received: from localhost ([127.0.0.1]:40202 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1sMVx7-0003GC-UG for submit@debbugs.gnu.org; Wed, 26 Jun 2024 12:57:02 -0400 Original-Received: from mail.eshelyaron.com ([107.175.124.16]:52088 helo=eshelyaron.com) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1sMVx5-0003Ft-06 for 71466@debbugs.gnu.org; Wed, 26 Jun 2024 12:57:00 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=eshelyaron.com; s=mail; t=1719421015; bh=8SMBErXM664nB0Hf6+IsdPHv0ylncAn+F5UaGVoWETY=; h=From:To:Cc:Subject:In-Reply-To:References:Date:From; b=aI5/zj9HeI0euuHNEFePutc7x8N6pTqQvQAlr5fBAaRIhaOK2COtVRXaYci7uW14r 9CHd94UpLUxDtHJLE0ZBO+dc39rCDDyRJKVVRCppdFiFH11S0Dtxd3+F9xsoDjCO4T KOdmKdbngZw9FleExJQ0HSWgInNV+abPAMLpiVlKqfQZrZoq4tnJd4ARgGW+mYyfrW odPWm8AGTUIiGrN/Kf/QCAXBmhBgs9KM7STCdciZRo0Zu31Gu/T/WSz+ftGFsut8Sa hE/bSoR7FQiHmmUyQ66eLfbauQMmtDWDAEHGkor/mxAAVdRDyui8cuWRJT4Hp0GPiM uPH6+jlqDgeFg== In-Reply-To: <865xtw9caa.fsf@gnu.org> (Eli Zaretskii's message of "Wed, 26 Jun 2024 14:25:01 +0300") 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:287957 Archived-At: --=-=-= Content-Type: text/plain Eli Zaretskii writes: >> Date: Wed, 26 Jun 2024 02:14:45 +0300 >> Cc: juri@linkov.net, me@eshelyaron.com, 71466@debbugs.gnu.org >> From: Dmitry Gutov >> >> >> That is my opinion as well: better obsolete it this way. >> > Why obsolete it at all? If we use an alias without obsoleting, I >> > think everyone wins. No? >> >> Well, we normally obsolete functions that aren't in use anymore, nor >> recommended for third parties. Right? >> >> We can stop from obsoleting it now (just make an alias), but add a >> comment to do that in the next Emacs release. How about that? > > Better. All right, so here's an updated patch. This is based on emacs-30, let me know if this should go to master instead. --=-=-= Content-Type: text/x-patch Content-Disposition: attachment; filename=0001-Use-revert-function-in-xref-buffer.patch >From 0b6756fd31b071a2c88f4731d4dc3a74fcfac5f8 Mon Sep 17 00:00:00 2001 From: Eshel Yaron Date: Wed, 26 Jun 2024 18:51:32 +0200 Subject: [PATCH] Use 'revert-function' in *xref* buffer * lisp/progmodes/xref.el (xref--xref-buffer-mode-map): Cease binding 'g' to 'xref-revert-buffer'. (xref--xref-buffer-mode): Set 'revert-buffer-function' to... (xref--revert-buffer): ...this. New function, renamed from... (xref-revert-buffer): ...this. Make it an alias of 'revert-buffer'. * etc/NEWS: Announce it. * doc/emacs/maintaining.texi (Xref Commands): Update docs. --- doc/emacs/maintaining.texi | 6 +++--- etc/NEWS | 7 +++++++ lisp/progmodes/xref.el | 17 +++++++---------- 3 files changed, 17 insertions(+), 13 deletions(-) diff --git a/doc/emacs/maintaining.texi b/doc/emacs/maintaining.texi index 3a9bef9884a..64d77fb88a5 100644 --- a/doc/emacs/maintaining.texi +++ b/doc/emacs/maintaining.texi @@ -2466,10 +2466,10 @@ Xref Commands @file{*xref*} buffers that show all the matches for an identifier in all the relevant files. @xref{Identifier Search}. +@cindex revert-buffer, in @file{*xref*} buffers @item g -@findex xref-revert-buffer -Refresh the contents of the @file{*xref*} buffer -(@code{xref-revert-buffer}). +Refresh the contents of the @file{*xref*} buffer (@code{revert-buffer}). +@xref{Reverting}. @item M-, @findex xref-quit-and-pop-marker-stack diff --git a/etc/NEWS b/etc/NEWS index 716eb612720..8d360063f7a 100644 --- a/etc/NEWS +++ b/etc/NEWS @@ -1916,6 +1916,13 @@ the 'widget-inactive' face). If non-nil, moving point forward or backward between widgets by typing 'TAB' or 'S-TAB' skips over inactive widgets. The default value is nil. +** Xref + +*** 'xref-revert-buffer' is now an alias of 'revert-buffer'. +The Xref buffer now sets up 'revert-buffer-function' such that +'revert-buffer' behaves like 'xref-revert-buffer' did in previous Emacs +versions, and the latter is now an alias of the former. + ** Ruby mode *** New user option 'ruby-rubocop-use-bundler'. diff --git a/lisp/progmodes/xref.el b/lisp/progmodes/xref.el index fb6c9dad73b..0b069941438 100644 --- a/lisp/progmodes/xref.el +++ b/lisp/progmodes/xref.el @@ -993,7 +993,6 @@ xref--xref-buffer-mode-map ;; suggested by Johan Claesson "to further reduce finger movement": (define-key map (kbd ".") #'xref-next-line) (define-key map (kbd ",") #'xref-prev-line) - (define-key map (kbd "g") #'xref-revert-buffer) (define-key map (kbd "M-,") #'xref-quit-and-pop-marker-stack) map)) @@ -1011,6 +1010,7 @@ xref--xref-buffer-mode #'xref--imenu-extract-index-name) (setq-local add-log-current-defun-function #'xref--add-log-current-defun) + (setq-local revert-buffer-function #'xref--revert-buffer) (setq-local outline-minor-mode-cycle t) (setq-local outline-minor-mode-use-buttons 'insert) (setq-local outline-search-function @@ -1273,22 +1273,16 @@ xref--show-common-initialize xref--original-window-intent (assoc-default 'display-action alist)) (setq xref--fetcher fetcher))) -(defun xref-revert-buffer () +(defun xref--revert-buffer (&rest _) ; Ignore `revert-buffer' args. "Refresh the search results in the current buffer." - (interactive) (let ((inhibit-read-only t) - (buffer-undo-list t) - restore-functions) - (when (boundp 'revert-buffer-restore-functions) - (run-hook-wrapped 'revert-buffer-restore-functions - (lambda (f) (push (funcall f) restore-functions) nil))) + (buffer-undo-list t)) (save-excursion (condition-case err (let ((alist (xref--analyze (funcall xref--fetcher))) (inhibit-modification-hooks t)) (erase-buffer) - (prog1 (xref--insert-xrefs alist) - (mapc #'funcall (delq nil restore-functions)))) + (xref--insert-xrefs alist)) (user-error (erase-buffer) (insert @@ -1296,6 +1290,9 @@ xref-revert-buffer (error-message-string err) 'face 'error))))))) +;;; FIXME: Make this alias obsolete in future release. +(defalias 'xref-revert-buffer #'revert-buffer) + (defun xref--auto-jump-first (buf value) (when value (select-window (get-buffer-window buf)) -- 2.45.0 --=-=-=--