From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!.POSTED.blaine.gmane.org!not-for-mail From: Stefan Kangas Newsgroups: gmane.emacs.bugs Subject: bug#35504: 26.2; Key `g' should run `package-menu-refresh' in the *Packages* buffer Date: Sat, 02 Nov 2019 03:32:31 +0100 Message-ID: <87lfszrosg.fsf@marxist.se> References: Mime-Version: 1.0 Content-Type: multipart/mixed; boundary="=-=-=" Injection-Info: blaine.gmane.org; posting-host="blaine.gmane.org:195.159.176.226"; logging-data="14107"; mail-complaints-to="usenet@blaine.gmane.org" User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/27.0.50 (gnu/linux) Cc: "Basil L. Contovounesios" , 35504@debbugs.gnu.org, Rudi Schlatte To: Stefan Monnier Original-X-From: bug-gnu-emacs-bounces+geb-bug-gnu-emacs=m.gmane.org@gnu.org Sat Nov 02 03:33:19 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.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.89) (envelope-from ) id 1iQjE4-0003V3-RC for geb-bug-gnu-emacs@m.gmane.org; Sat, 02 Nov 2019 03:33:17 +0100 Original-Received: from localhost ([::1]:44888 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1iQjE2-0003vO-Ur for geb-bug-gnu-emacs@m.gmane.org; Fri, 01 Nov 2019 22:33:14 -0400 Original-Received: from eggs.gnu.org ([2001:470:142:3::10]:40551) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1iQjDs-0003vF-Mn for bug-gnu-emacs@gnu.org; Fri, 01 Nov 2019 22:33:06 -0400 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1iQjDr-0005CW-6g for bug-gnu-emacs@gnu.org; Fri, 01 Nov 2019 22:33:04 -0400 Original-Received: from debbugs.gnu.org ([209.51.188.43]:49080) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1iQjDq-0005CB-Q6 for bug-gnu-emacs@gnu.org; Fri, 01 Nov 2019 22:33:03 -0400 Original-Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1iQjDq-0000zx-Hc for bug-gnu-emacs@gnu.org; Fri, 01 Nov 2019 22:33:02 -0400 X-Loop: help-debbugs@gnu.org Resent-From: Stefan Kangas Original-Sender: "Debbugs-submit" Resent-CC: bug-gnu-emacs@gnu.org Resent-Date: Sat, 02 Nov 2019 02:33:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 35504 X-GNU-PR-Package: emacs X-GNU-PR-Keywords: patch Original-Received: via spool by 35504-submit@debbugs.gnu.org id=B35504.15726619633808 (code B ref 35504); Sat, 02 Nov 2019 02:33:02 +0000 Original-Received: (at 35504) by debbugs.gnu.org; 2 Nov 2019 02:32:43 +0000 Original-Received: from localhost ([127.0.0.1]:57901 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1iQjDX-0000zM-2M for submit@debbugs.gnu.org; Fri, 01 Nov 2019 22:32:43 -0400 Original-Received: from host.gofardesign.uk ([208.79.239.190]:60252) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1iQjDU-0000zA-Kt for 35504@debbugs.gnu.org; Fri, 01 Nov 2019 22:32:41 -0400 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=marxist.se; s=default; h=Content-Type:MIME-Version:Message-ID:Date:References: In-Reply-To:Subject:Cc:To:From:Sender:Reply-To:Content-Transfer-Encoding: Content-ID:Content-Description:Resent-Date:Resent-From:Resent-Sender: Resent-To:Resent-Cc:Resent-Message-ID:List-Id:List-Help:List-Unsubscribe: List-Subscribe:List-Post:List-Owner:List-Archive; bh=Yhxu97b5PR3jPBUxzzfjD/rOhchkU4/dgBBfj5HqufI=; b=eGa7H3hqJHWQ6VhOtupEGn/hCx 7xKHdiz0DTYIy4+Xa2SK42LyZ0hSGxIU3opqqbONQ2o9h2xQ56rI8RscYoshETDRDV5hmNa55jtwy Q9ADDChPbxujuk9wd0M/dC2Y+Vxx6pnOGa79ojlBQO5mPgEY1mShsF2FjHz9WF83U+os=; Original-Received: from h-70-69.a785.priv.bahnhof.se ([155.4.70.69]:41858 helo=localhost) by host.gofardesign.uk with esmtpsa (TLSv1.2:ECDHE-RSA-AES256-GCM-SHA384:256) (Exim 4.92) (envelope-from ) id 1iQjDN-0005JU-M6; Fri, 01 Nov 2019 21:32:34 -0500 In-Reply-To: (Stefan Kangas's message of "Fri, 4 Oct 2019 17:09:09 +0200") X-OutGoing-Spam-Status: No, score=-1.0 X-AntiAbuse: This header was added to track abuse, please include it with any abuse report X-AntiAbuse: Primary Hostname - host.gofardesign.uk X-AntiAbuse: Original Domain - debbugs.gnu.org X-AntiAbuse: Originator/Caller UID/GID - [47 12] / [47 12] X-AntiAbuse: Sender Address Domain - marxist.se X-Get-Message-Sender-Via: host.gofardesign.uk: authenticated_id: stefan@marxist.se X-Authenticated-Sender: host.gofardesign.uk: stefan@marxist.se 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:170744 Archived-At: --=-=-= Content-Type: text/plain Stefan Kangas writes: > Stefan Monnier writes: >> >> >> Fine by me. I wonder, tho: why not set revert-buffer-function and then >> >> redefine `package-menu-refresh` as an obsolete alias for `revert-buffer`? >> > Sure, I've tried to do that in the attached patch. WDYT? >> [...] >> > + (setq revert-buffer-function 'package-menu-revert) >> [...] >> > +(define-obsolete-function-alias 'package-menu-refresh 'package-menu-revert "27.1") >> >> Could we make package-menu-refresh to be an (obsolete) alias of >> `revert-buffer` instead (and make package-menu-revert an internal >> non-interactive function)? > > Absolutely, thanks for the suggestion. Fixed in the attached patch > together with the things Basil pointed out. > > Please let me know what you think. I've attached an updated patch below. If there are no further comments, I intend to commit it in a couple of days. Best regards, Stefan Kangas --=-=-= Content-Type: text/x-diff Content-Disposition: inline; filename=0001-Make-g-refresh-package-data-in-package-menu.patch >From 71bda0bd328a901b2dc17e76f032efd0a10fcfec Mon Sep 17 00:00:00 2001 From: Stefan Kangas Date: Fri, 26 Jul 2019 12:49:35 +0200 Subject: [PATCH] Make 'g' refresh package data in package menu * lisp/emacs-lisp/package.el (package-menu--refresh): Rename from 'package-menu-refresh', make internal and non-interactive. (package-menu-mode-map, package-menu-mode-menu, package-menu-mode) (list-packages): Use the above. (Bug#35504) (package-menu-refresh): Redefine as obsolete fuction alias for 'revert-buffer'. * doc/emacs/package.texi (Package Menu): Document it. * etc/NEWS: Announce it. --- doc/emacs/package.texi | 9 +++++---- etc/NEWS | 8 ++++++++ lisp/emacs-lisp/package.el | 17 +++++++++++------ 3 files changed, 24 insertions(+), 10 deletions(-) diff --git a/doc/emacs/package.texi b/doc/emacs/package.texi index 19efff7445..1c0f853427 100644 --- a/doc/emacs/package.texi +++ b/doc/emacs/package.texi @@ -149,12 +149,13 @@ Package Menu dependencies; also, delete all packages marked with @kbd{d} (@code{package-menu-execute}). This also removes the marks. +@item g @item r +@kindex g @r{(Package Menu)} @kindex r @r{(Package Menu)} -@findex package-menu-refresh -Refresh the package list (@code{package-menu-refresh}). This fetches -the list of available packages from the package archive again, and -recomputes the package list. +Refresh the package list (@code{revert-buffer}). This fetches the +list of available packages from the package archive again, and +redisplays the package list. @item / k @kindex / k @r{(Package Menu)} diff --git a/etc/NEWS b/etc/NEWS index e614197125..79410bbec3 100644 --- a/etc/NEWS +++ b/etc/NEWS @@ -1131,6 +1131,14 @@ the 'package-menu-clear-filter' function, bound to '/ /' by default. --- *** The package list can now be sorted by version or description. ++++ +*** In Package Menu, 'g' now updates package data from archives. +Previously, 'g' invoked 'tabulated-list-revert' which did not update +the cached archive data. It is now bound to 'revert-buffer', which +will now update the data. + +'package-menu-refresh' is an obsolete alias for 'revert-buffer'. + ** Info +++ diff --git a/lisp/emacs-lisp/package.el b/lisp/emacs-lisp/package.el index 8c8e86aead..3363b1bb52 100644 --- a/lisp/emacs-lisp/package.el +++ b/lisp/emacs-lisp/package.el @@ -2690,7 +2690,7 @@ package-menu-mode-map (define-key map "d" 'package-menu-mark-delete) (define-key map "i" 'package-menu-mark-install) (define-key map "U" 'package-menu-mark-upgrades) - (define-key map "r" 'package-menu-refresh) + (define-key map "r" 'revert-buffer) (define-key map (kbd "/ k") 'package-menu-filter-by-keyword) (define-key map (kbd "/ n") 'package-menu-filter-by-name) (define-key map (kbd "/ /") 'package-menu-clear-filter) @@ -2709,7 +2709,7 @@ package-menu-mode-menu ["Describe Package" package-menu-describe-package :help "Display information about this package"] ["Help" package-menu-quick-help :help "Show short key binding help for package-menu-mode"] "--" - ["Refresh Package List" package-menu-refresh + ["Refresh Package List" revert-buffer :help "Redownload the ELPA archive" :active (not package--downloads-in-progress)] ["Redisplay buffer" revert-buffer :help "Update the buffer with current list of packages"] @@ -2764,6 +2764,7 @@ package-menu-mode (setq tabulated-list-sort-key (cons "Status" nil)) (add-hook 'tabulated-list-revert-hook #'package-menu--refresh nil t) (tabulated-list-init-header) + (setq revert-buffer-function 'package-menu--refresh) (setf imenu-prev-index-position-function #'package--imenu-prev-index-position-function) (setf imenu-extract-index-name-function @@ -3161,12 +3162,15 @@ package-menu--print-info-simple (defvar package-menu--old-archive-contents nil "`package-archive-contents' before the latest refresh.") -(defun package-menu-refresh () +(defun package-menu--refresh (&optional _arg _noconfirm) "In Package Menu, download the Emacs Lisp package archive. Fetch the contents of each archive specified in `package-archives', and then refresh the package menu. Signal a -user-error if there is already a refresh running asynchronously." - (interactive) +user-error if there is already a refresh running asynchronously. + +`package-menu-mode' sets `revert-buffer-function' to this +function. The args ARG and NOCONFIRM, passed from +`revert-buffer', are ignored." (unless (derived-mode-p 'package-menu-mode) (user-error "The current buffer is not a Package Menu")) (when (and package-menu-async package--downloads-in-progress) @@ -3174,6 +3178,7 @@ package-menu-refresh (setq package-menu--old-archive-contents package-archive-contents) (setq package-menu--new-package-list nil) (package-refresh-contents package-menu-async)) +(define-obsolete-function-alias 'package-menu-refresh 'revert-buffer "27.1") (defun package-menu-hide-package () "Hide a package under point in Package Menu. @@ -3637,7 +3642,7 @@ list-packages (package-menu-mode) ;; Fetch the remote list of packages. - (unless no-fetch (package-menu-refresh)) + (unless no-fetch (package-menu--refresh)) ;; If we're not async, this would be redundant. (when package-menu-async -- 2.20.1 --=-=-=--