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: Wed, 12 Apr 2023 19:39:20 +0000 Message-ID: <87wn2gkhzr.fsf@posteo.net> References: <87a5zj2vfo.fsf@gmail.com> <831qkq9rpy.fsf@gnu.org> <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> 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="7593"; mail-complaints-to="usenet@ciao.gmane.io" Cc: larsi@gnus.org, 62720@debbugs.gnu.org, =?UTF-8?Q?Jo=C3=A3o_?= =?UTF-8?Q?T=C3=A1vora?= , monnier@iro.umontreal.ca To: Eli Zaretskii Original-X-From: bug-gnu-emacs-bounces+geb-bug-gnu-emacs=m.gmane-mx.org@gnu.org Wed Apr 12 21:40:40 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 1pmgKd-0001ku-7W for geb-bug-gnu-emacs@m.gmane-mx.org; Wed, 12 Apr 2023 21:40:39 +0200 Original-Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1pmgKH-0005Z4-Df; Wed, 12 Apr 2023 15:40:17 -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 1pmgK7-0005Yd-Tt for bug-gnu-emacs@gnu.org; Wed, 12 Apr 2023 15:40:09 -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 1pmgK2-0005xE-7l for bug-gnu-emacs@gnu.org; Wed, 12 Apr 2023 15:40:05 -0400 Original-Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1pmgK1-0006bo-Jz for bug-gnu-emacs@gnu.org; Wed, 12 Apr 2023 15:40: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: Wed, 12 Apr 2023 19:40: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.168132834325330 (code B ref 62720); Wed, 12 Apr 2023 19:40:01 +0000 Original-Received: (at 62720) by debbugs.gnu.org; 12 Apr 2023 19:39:03 +0000 Original-Received: from localhost ([127.0.0.1]:41829 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pmgJ4-0006aT-Mc for submit@debbugs.gnu.org; Wed, 12 Apr 2023 15:39:03 -0400 Original-Received: from mout01.posteo.de ([185.67.36.65]:57773) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pmgIz-0006Zq-TU for 62720@debbugs.gnu.org; Wed, 12 Apr 2023 15:39:01 -0400 Original-Received: from submission (posteo.de [185.67.36.169]) by mout01.posteo.de (Postfix) with ESMTPS id 5FA542402A0 for <62720@debbugs.gnu.org>; Wed, 12 Apr 2023 21:38:52 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=posteo.net; s=2017; t=1681328332; bh=BFjy2nWNot9H8eHB6wqIBr/boH6jbQSV5FY7/Uj68SQ=; h=From:To:Cc:Subject:Autocrypt:Date:From; b=LGR2JFPg+bXoQ46dgr0uc1NiVbWyVQ3u91hZfn0gJKgHNxjD7qpZMFx6o3XeLAHFM 7BzEl5fgAwBG7C0jE1y/HrnV48xEbfs2Ks8SMfMY7k5oSkVcRcDxp2Tg2WTDhjVDJ0 K1Q9Pe0dzbJhkvbRAYMRSyTWpNU92391OOQq8D5oBIOu00FHnLxsyCZawVVlRQ89Hu F0SHgpgGMoX1WAOHVsL6tUArHryaTPQqWGC/Y8BOYg3XQFBTT1mbcyp+hHOOD6YnQN XKQJVrXt9KnH3YUlRVcZ9WGl2IWKRIGQhyFu3Lc9RPspu+sbfxDqa6aCihydItYPIF dTCUeidnuOFdQ== Original-Received: from customer (localhost [127.0.0.1]) by submission (posteo.de) with ESMTPSA id 4PxY166zTFz6tw7; Wed, 12 Apr 2023 21:38:50 +0200 (CEST) In-Reply-To: <83wn2h5825.fsf@gnu.org> (Eli Zaretskii's message of "Wed, 12 Apr 2023 20:22:58 +0300") 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:259806 Archived-At: --=-=-= Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable Eli Zaretskii writes: >> From: Jo=C3=A3o T=C3=A1vora >> Date: Wed, 12 Apr 2023 18:14:28 +0100 >> Cc: "Philip K." , Stefan Monnier >> , 62720@debbugs.gnu.org, >> Lars Ingebrigtsen >>=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. Here you have (1): --=-=-= Content-Type: text/x-diff Content-Disposition: attachment; filename=0001-Allow-upgrading-built-in-packages.patch >From 09a9e769ed0c7024c33bc135c57894daff8764af Mon Sep 17 00:00:00 2001 From: Philip Kaludercic Date: Wed, 12 Apr 2023 14:26:39 +0200 Subject: [PATCH] Allow upgrading built-in packages * lisp/emacs-lisp/package.el (package--upgradable-built-in-p): Add new utility predicate. (package-compute-transaction): Check if an installed package is built-in while resolving dependencies and allow it to be installed. (package-install): Suggest upgrading built-in packages in the interactive specification, when invoked with a prefix argument. Allow upgrading built-in packages --- lisp/emacs-lisp/package.el | 41 +++++++++++++++++++++++++++++++------- 1 file changed, 34 insertions(+), 7 deletions(-) diff --git a/lisp/emacs-lisp/package.el b/lisp/emacs-lisp/package.el index f92afe56b76..03e63ee7227 100644 --- a/lisp/emacs-lisp/package.el +++ b/lisp/emacs-lisp/package.el @@ -797,6 +797,20 @@ package-built-in-p (require 'finder-inf nil t) ; For `package--builtins'. (assq package package--builtins)))))) +(defun package--upgradable-built-in-p (package) + "Check if a built-in PACKAGE can be upgraded. +This command differs from `package-built-in-p' in that it only +returns a non-nil value if the user has not installed a more +recent version of the package from a package archive." + (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." @@ -1908,7 +1922,16 @@ package-compute-transaction (package-version-join (package-desc-version already))))) (cond (already nil) - ((package-installed-p next-pkg next-version) nil) + ;; If a package is installed, we don't need to continue. + ;; Built-in packages constitute an exception, because we want + ;; to allow the user to "upgrade" from a built-in version to a + ;; potentially newer version available on ELPA (bug#62720). + ((and (not (package--upgradable-built-in-p next-pkg)) + (package-installed-p next-pkg next-version))) + ;; The pseudo-package Emacs is always installed and built-in. + ;; It cannot be upgraded, so we make sure not to proceed beyond + ;; this point when resolving dependencies. + ((eq next-pkg 'emacs)) (t ;; A package is required, but not installed. It might also be @@ -2187,7 +2210,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 +2230,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) -- 2.39.2 --=-=-=--