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 12:28:28 +0000 Message-ID: <87ile1thcj.fsf@posteo.net> References: <87a5zj2vfo.fsf@gmail.com> <87y1mz38rl.fsf@posteo.net> <87ile2n0kn.fsf@gmail.com> <83v8i2abqi.fsf@gnu.org> <87wn2ilgx7.fsf@gmail.com> <83a5ze9uc1.fsf@gnu.org> <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> <87r0spjntm.fsf@gmail.com> 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="28322"; mail-complaints-to="usenet@ciao.gmane.io" Cc: larsi@gnus.org, 62720@debbugs.gnu.org, Eli Zaretskii , monnier@iro.umontreal.ca To: =?UTF-8?Q?Jo=C3=A3o_?= =?UTF-8?Q?T=C3=A1vora?= Original-X-From: bug-gnu-emacs-bounces+geb-bug-gnu-emacs=m.gmane-mx.org@gnu.org Wed Apr 12 14:29:24 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 1pmZbH-000765-Hw for geb-bug-gnu-emacs@m.gmane-mx.org; Wed, 12 Apr 2023 14:29:23 +0200 Original-Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1pmZay-0004jr-Cw; Wed, 12 Apr 2023 08:29:04 -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 1pmZaw-0004ji-Mz for bug-gnu-emacs@gnu.org; Wed, 12 Apr 2023 08:29:02 -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 1pmZaw-0003UF-3D for bug-gnu-emacs@gnu.org; Wed, 12 Apr 2023 08:29:02 -0400 Original-Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1pmZav-0007NH-Kr for bug-gnu-emacs@gnu.org; Wed, 12 Apr 2023 08:29: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 12:29: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.168130249328289 (code B ref 62720); Wed, 12 Apr 2023 12:29:01 +0000 Original-Received: (at 62720) by debbugs.gnu.org; 12 Apr 2023 12:28:13 +0000 Original-Received: from localhost ([127.0.0.1]:39244 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pmZa9-0007MC-0n for submit@debbugs.gnu.org; Wed, 12 Apr 2023 08:28:13 -0400 Original-Received: from mout02.posteo.de ([185.67.36.66]:58347) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pmZa3-0007Lu-O9 for 62720@debbugs.gnu.org; Wed, 12 Apr 2023 08:28:11 -0400 Original-Received: from submission (posteo.de [185.67.36.169]) by mout02.posteo.de (Postfix) with ESMTPS id 7BD082403F1 for <62720@debbugs.gnu.org>; Wed, 12 Apr 2023 14:28:01 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=posteo.net; s=2017; t=1681302481; bh=b9E6NWUI5c7bybzGS60TIoPg/hCa84PSc+s0YjnDZZM=; h=From:To:Cc:Subject:Autocrypt:Date:From; b=aPwrudUx98QfQbTXhKbBXlviG/OXiCZVkWBvRf8iJxKG+5nKNX/shPhf5uDdpFQTW pXE7LTAHdfwfChEI/3VDsGKNImg9Ka2UKBhkAMPLgINjxpkdl+ml31nIaxV7Gy+LEf MqzKPuiO5vDp/XFDwVUzCZissQOx44SiHxZ7hO09wCs0wGPjVbtbUwQZuggdaj2k6P Zx63HakpG/mip/+UHuvg02xBHLaJQR9U7yeFK+5U1OAZWj7MKoaNyUiIoiELjGnKl+ z9+fNU4vQ4xDrumFf1P7BRz2f7WQeLh/MeNXiXALPJgRJd0UE+Zjq5LFImXbWlITT1 fE26CJebNtQEg== Original-Received: from customer (localhost [127.0.0.1]) by submission (posteo.de) with ESMTPSA id 4PxMS00mJ3z9rxP; Wed, 12 Apr 2023 14:28:00 +0200 (CEST) In-Reply-To: <87r0spjntm.fsf@gmail.com> ("=?UTF-8?Q?Jo=C3=A3o_?= =?UTF-8?Q?T=C3=A1vora?="'s message of "Wed, 12 Apr 2023 13:18:45 +0100") 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:259732 Archived-At: --=-=-= Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable Jo=C3=A3o T=C3=A1vora writes: > Philip Kaludercic writes: > >>>> Can we put this tiny patch on master then? >>> >>> Yes, if Philip and Stefan don't object. But, since there will be a >>> command for updating core packages, doesn't this go against your >>> desire not to change the UX? >> >> After thinking about this for a bit, I think that the right approach is >> to use package-install instead of writing a separate command. After >> all, this will make the behaviour of package-install consistent with >> that of the package menu. > > +1000 > >> It might work but it should be tested somewhat thoroughly before the >> patch is applied. In the meantime, I just finished a similar approach >> that does not modify `package-installed-p', but just adds another >> utility function: > > I've just applied it, re-made emacs, tested with Emacs -Q and now M-x > package-install doesn't offer _any_ completions to install, core or > non-core. Is this what you intended? No, that was my mistake (I changed something last minute before applying the patch). This patch should behave properly: --=-=-= Content-Type: text/x-diff Content-Disposition: attachment; filename=0001-Allow-upgrading-built-in-packages.patch >From 8c742056f2669a21de16488652e114cba8c8147a 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-core-p): Add new utility function. (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. --- lisp/emacs-lisp/package.el | 36 ++++++++++++++++++++++++++++++------ 1 file changed, 30 insertions(+), 6 deletions(-) diff --git a/lisp/emacs-lisp/package.el b/lisp/emacs-lisp/package.el index f92afe56b76..91fbbb11f68 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-core-p (package) + "Return non-nil the built-in version of PACKAGE is loaded. +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 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 (package-installed-p next-pkg next-version) + (not (package-core-p next-pkg)))) + ;; 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 @@ -2205,11 +2228,12 @@ 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 (not (package-installed-p (car elt))) + (package-core-p (car elt))) + (list (car elt)))) + package-archive-contents) nil t)) nil))) (package--archives-initialize) -- 2.39.2 --=-=-=--