From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.io!.POSTED.blaine.gmane.org!not-for-mail From: Philip Kaludercic Newsgroups: gmane.emacs.bugs Subject: bug#62720: 29.0.60; Not easy at all to upgrade :core packages like Eglot Date: Thu, 13 Apr 2023 15:14:51 +0000 Message-ID: <87a5zblspg.fsf@posteo.net> References: <87a5zj2vfo.fsf@gmail.com> <83pm898xb9.fsf@gnu.org> <87h6tlleg0.fsf@gmail.com> <8335558qc7.fsf@gnu.org> <83sfd5761f.fsf@gnu.org> <87zg7djrgr.fsf@gmail.com> <83o7nt73za.fsf@gnu.org> <83mt3d73c2.fsf@gnu.org> <87r0sptinq.fsf@posteo.net> <83jzyh706c.fsf@gnu.org> <875ya1tdwf.fsf@posteo.net> <83edop6sdy.fsf@gnu.org> <831qkp6o0i.fsf@gnu.org> <83wn2h5825.fsf@gnu.org> <87wn2gkhzr.fsf@posteo.net> <83cz485oxi.fsf@gnu.org> <87leiwdyff.fsf@posteo.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="24607"; mail-complaints-to="usenet@ciao.gmane.io" Cc: larsi@gnus.org, 62720@debbugs.gnu.org, joaotavora@gmail.com, monnier@iro.umontreal.ca To: Eli Zaretskii Original-X-From: bug-gnu-emacs-bounces+geb-bug-gnu-emacs=m.gmane-mx.org@gnu.org Thu Apr 13 17:15:39 2023 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 1pmyfi-0006Ff-Ai for geb-bug-gnu-emacs@m.gmane-mx.org; Thu, 13 Apr 2023 17:15:38 +0200 Original-Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1pmyfH-0004Bn-Sr; Thu, 13 Apr 2023 11:15:12 -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 1pmyfA-0003xJ-Ou for bug-gnu-emacs@gnu.org; Thu, 13 Apr 2023 11:15:07 -0400 Original-Received: from debbugs.gnu.org ([209.51.188.43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1pmyf8-0006yd-Ja for bug-gnu-emacs@gnu.org; Thu, 13 Apr 2023 11:15:02 -0400 Original-Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1pmyf7-00074P-UN for bug-gnu-emacs@gnu.org; Thu, 13 Apr 2023 11:15:01 -0400 X-Loop: help-debbugs@gnu.org Resent-From: Philip Kaludercic Original-Sender: "Debbugs-submit" Resent-CC: bug-gnu-emacs@gnu.org Resent-Date: Thu, 13 Apr 2023 15:15:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 62720 X-GNU-PR-Package: emacs Original-Received: via spool by 62720-submit@debbugs.gnu.org id=B62720.168139887227117 (code B ref 62720); Thu, 13 Apr 2023 15:15:01 +0000 Original-Received: (at 62720) by debbugs.gnu.org; 13 Apr 2023 15:14:32 +0000 Original-Received: from localhost ([127.0.0.1]:44464 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pmyee-00073I-9W for submit@debbugs.gnu.org; Thu, 13 Apr 2023 11:14:32 -0400 Original-Received: from mout02.posteo.de ([185.67.36.66]:40623) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pmyeb-000733-98 for 62720@debbugs.gnu.org; Thu, 13 Apr 2023 11:14:31 -0400 Original-Received: from submission (posteo.de [185.67.36.169]) by mout02.posteo.de (Postfix) with ESMTPS id 4270F24043F for <62720@debbugs.gnu.org>; Thu, 13 Apr 2023 17:14:23 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=posteo.net; s=2017; t=1681398863; bh=F7wSEqbUqH464D5B5P/AyYndxmYaHKHp1F/55ReFQp0=; h=From:To:Cc:Subject:Autocrypt:Date:From; b=OsuA/NG2WLaSA7fxbTLg0Z9GHy0GZmNOKOChsohQ9/jCHLXKNqu+dS/z+eA/620Gi gyfkDOE31jTGOMJcXa0CF5+5gDaUrH1unsglcFXKZnwU01jq8fJ44WO3AESDO8c210 h6aZ6H/vvRO0FBeQ6pSk76ZKKtfijCP4xTCbfGp2z5KeaRX/QL/BGX6NcozSyu2st4 hWSn85yTgB1dIc+GH1foAYPLu/mDz5tag/sBIhAVhfLvkyThiixmxNl5FHjs++N1cO z+sFoEAYkFFecGLAyg811bppy2+oJtK4kmxtO3ahGVsX+XE+W3sQWfrP4c5CvhjvMP VJa4NqYGDcGWw== Original-Received: from customer (localhost [127.0.0.1]) by submission (posteo.de) with ESMTPSA id 4Py35V0xR2z9rxR; Thu, 13 Apr 2023 17:14:22 +0200 (CEST) In-Reply-To: <87leiwdyff.fsf@posteo.net> (Philip Kaludercic's message of "Thu, 13 Apr 2023 09:38:28 +0200") Autocrypt: addr=philipk@posteo.net; keydata= mDMEZBBQQhYJKwYBBAHaRw8BAQdAHJuofBrfqFh12uQu0Yi7mrl525F28eTmwUDflFNmdui0QlBo aWxpcCBLYWx1ZGVyY2ljIChnZW5lcmF0ZWQgYnkgYXV0b2NyeXB0LmVsKSA8cGhpbGlwa0Bwb3N0 ZW8ubmV0PoiWBBMWCAA+FiEEDg7HY17ghYlni8XN8xYDWXahwukFAmQQUEICGwMFCQHhM4AFCwkI BwIGFQoJCAsCBBYCAwECHgECF4AACgkQ8xYDWXahwulikAEA77hloUiSrXgFkUVJhlKBpLCHUjA0 mWZ9j9w5d08+jVwBAK6c4iGP7j+/PhbkxaEKa4V3MzIl7zJkcNNjHCXmvFcEuDgEZBBQQhIKKwYB BAGXVQEFAQEHQI5NLiLRjZy3OfSt1dhCmFyn+fN/QKELUYQetiaoe+MMAwEIB4h+BBgWCAAmFiEE Dg7HY17ghYlni8XN8xYDWXahwukFAmQQUEICGwwFCQHhM4AACgkQ8xYDWXahwukm+wEA8cml4JpK NeAu65rg+auKrPOP6TP/4YWRCTIvuYDm0joBALw98AMz7/qMHvSCeU/hw9PL6u6R2EScxtpKnWof z4oM 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:259863 Archived-At: --=-=-= Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable Philip Kaludercic writes: > Eli Zaretskii writes: > >>> From: Philip Kaludercic >>> Cc: Jo=C3=A3o T=C3=A1vora , >>> monnier@iro.umontreal.ca, >>> 62720@debbugs.gnu.org, larsi@gnus.org >>> Date: Wed, 12 Apr 2023 19:39:20 +0000 >>>=20 >>> >> Please, in normal non-shouting case, explain to me how you think >>> >> that the behavior of an existing >>> >> command can be changed with "completely separate code".=20 >>> > >>> > I already did: either (1) add a prefix argument to an existing >>> > command, which will then trigger the new behavior, or (2) add a >>> > separate command. >>>=20 >>> Here you have (1): >> >> Thanks. This is almost on-target, but it modifies >> package-compute-transaction. Is that necessary? > > I have found an alternative that doesn't change the way > `package-compute-transaction' works, but requires a small change in > `package-install': I have found a smaller but equivalent change that would also solve the issue: --=-=-= Content-Type: text/plain Content-Disposition: inline diff --git a/lisp/emacs-lisp/package.el b/lisp/emacs-lisp/package.el index f92afe56b76..842a475290d 100644 --- a/lisp/emacs-lisp/package.el +++ b/lisp/emacs-lisp/package.el @@ -797,6 +797,17 @@ package-built-in-p (require 'finder-inf nil t) ; For `package--builtins'. (assq package package--builtins)))))) +(defun package--upgradable-built-in-p (package) + "Return non-nil if PACKAGE if the built-in version is used." + (and (not (assq (cond + ((package-desc-p package) + (package-desc-name package)) + ((stringp package) (intern package)) + ((symbolp package) package) + ((error "Unknown package format: %S" package))) + (package--alist))) + (package-built-in-p package))) + (defun package--autoloads-file-name (pkg-desc) "Return the absolute name of the autoloads file, sans extension. PKG-DESC is a `package-desc' object." @@ -2187,7 +2198,9 @@ package-install "Install the package PKG. PKG can be a `package-desc' or a symbol naming one of the available packages in an archive in `package-archives'. When -called interactively, prompt for the package name. +called interactively, prompt for the package name. When invoked +with a prefix argument, the prompt will include built-in packages +that can be upgraded via an archive. Mark the installed package as selected by adding it to `package-selected-packages'. @@ -2205,11 +2218,13 @@ package-install (package--archives-initialize) (list (intern (completing-read "Install package: " - (delq nil - (mapcar (lambda (elt) - (unless (package-installed-p (car elt)) - (symbol-name (car elt)))) - package-archive-contents)) + (mapcan + (lambda (elt) + (and (or (and current-prefix-arg + (package--upgradable-built-in-p (car elt))) + (not (package-installed-p (car elt)))) + (list (car elt)))) + package-archive-contents) nil t)) nil))) (package--archives-initialize) @@ -2220,6 +2235,8 @@ package-install (unless (or dont-select (package--user-selected-p name)) (package--save-selected-packages (cons name package-selected-packages))) + (when (package--upgradable-built-in-p pkg) + (setq pkg (cadr (assq name package-archive-contents)))) (if-let* ((transaction (if (package-desc-p pkg) (unless (package-installed-p pkg) --=-=-= Content-Type: text/plain This relies on the fact that package-install handles package descriptor objects in a different way than when you just call the function with a package name. This would also mean that an alternative solution to this issue would be to tell users to evaluate (package-install (cadr (assq 'eglot package-archive-contents))) but I don't know how user-friendly of an idea this is. --=-=-=--