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.devel Subject: Re: emacs-29 9b775ddc057 1/2: ; * etc/EGLOT-NEWS: Fix wording of last change. Date: Wed, 10 May 2023 11:03:58 +0000 Message-ID: <87ild04fdt.fsf@posteo.net> References: <168335548287.8529.4912240840977468283@vcs2.savannah.gnu.org> <83ttwpfvcr.fsf@gnu.org> <83h6spfose.fsf@gnu.org> <35df1362-fd92-9424-97d0-df3479414677@gutov.dev> <83edntfm6e.fsf@gnu.org> <667d5cc1-4a3c-5cd4-21c0-adff89cea769@gutov.dev> <834jopfdwz.fsf@gnu.org> <83v8h4elki.fsf@gnu.org> <87h6sofs02.fsf@posteo.net> <83r0rsebcf.fsf@gnu.org> <875y94f4eo.fsf@posteo.net> <834joodmaw.fsf@gnu.org> <87o7mwgd1x.fsf@posteo.net> <83y1m0c4zq.fsf@gnu.org> <87fs88gc5a.fsf@posteo.net> <83sfc7cbnx.fsf@gnu.org> <87cz3b6j6l.fsf@posteo.net> <838rdzc4zf.fsf@gnu.org> <87cz38fz8d.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="13771"; mail-complaints-to="usenet@ciao.gmane.io" Cc: dmitry@gutov.dev, monnier@iro.umontreal.ca, emacs-devel@gnu.org To: Eli Zaretskii Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane-mx.org@gnu.org Wed May 10 13:05:11 2023 Return-path: Envelope-to: ged-emacs-devel@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 1pwhd8-0003M2-R4 for ged-emacs-devel@m.gmane-mx.org; Wed, 10 May 2023 13:05:10 +0200 Original-Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1pwhcP-0006Nr-I3; Wed, 10 May 2023 07:04:25 -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 1pwhc4-0006EV-Lr for emacs-devel@gnu.org; Wed, 10 May 2023 07:04:06 -0400 Original-Received: from mout01.posteo.de ([185.67.36.65]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1pwhc2-0006Y1-JV for emacs-devel@gnu.org; Wed, 10 May 2023 07:04:04 -0400 Original-Received: from submission (posteo.de [185.67.36.169]) by mout01.posteo.de (Postfix) with ESMTPS id 2A3F1240217 for ; Wed, 10 May 2023 13:04:00 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=posteo.net; s=2017; t=1683716640; bh=tY/gMeS7oUKaUr9IaZrYSXZMDvA42Kpa0UDCmvVgiZk=; h=From:To:Cc:Subject:Autocrypt:Date:From; b=hXPrRq1UbTRdOLuMUpfgHuSAGMmxoESGAPanUvOVwo/+mrrxwDX5WGY9FSDJYAioF bUiOd0L9T/od5yhSn6XcEu4mWjiRzUYRE2hcUt0GqKt/NodX0PItxQXIp2x9nCEkii s0unjnMovmC3KhA9OvN0t/bb3Lyt6VQaXgDNty1LejJ75YmLTiE7KND9l82mPnhKE1 iUGpolV5ayKii6Vj8326+QkFE+QcXoNyhXCRQvkxQmkWp+mbg3FLhfVboqQTcF2sjI CVsbZnKqFFt6XYVxJ9CifDp95Od89rnOXmb6zr6778IBuGeg+Zr6HwoC2yqAYf7gUm rlcdFz9tQS/rQ== Original-Received: from customer (localhost [127.0.0.1]) by submission (posteo.de) with ESMTPSA id 4QGXG71jfSz9rxT; Wed, 10 May 2023 13:03:59 +0200 (CEST) In-Reply-To: <87cz38fz8d.fsf@posteo.net> (Philip Kaludercic's message of "Wed, 10 May 2023 08:59:46 +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 Received-SPF: pass client-ip=185.67.36.65; envelope-from=philipk@posteo.net; helo=mout01.posteo.de X-Spam_score_int: -43 X-Spam_score: -4.4 X-Spam_bar: ---- X-Spam_report: (-4.4 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_MED=-2.3, RCVD_IN_MSPIKE_H2=-0.001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, T_SCC_BODY_TEXT_LINE=-0.01 autolearn=unavailable autolearn_force=no X-Spam_action: no action X-BeenThere: emacs-devel@gnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: "Emacs development discussions." List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: emacs-devel-bounces+ged-emacs-devel=m.gmane-mx.org@gnu.org Original-Sender: emacs-devel-bounces+ged-emacs-devel=m.gmane-mx.org@gnu.org Xref: news.gmane.io gmane.emacs.devel:306024 Archived-At: --=-=-= Content-Type: text/plain Philip Kaludercic writes: > Eli Zaretskii writes: > >>> From: Philip Kaludercic >>> Cc: dmitry@gutov.dev, monnier@iro.umontreal.ca, emacs-devel@gnu.org >>> Date: Mon, 08 May 2023 13:34:26 +0000 >>> >>> >> At least nadvice, cl-lib and cl-generic seem to be the odd ones (the >>> >> built-in versions are higher, and the ELPA packages are supposed to be >>> >> used as shims or backward compatibility wrappers). That looks like a bug. >>> >>> I think you are right, I can extend my previous patch by a version check. >> >> Good idea, IMO. > > OK, then this is my proposal: I noticed a bug, here is a revised version: --=-=-= Content-Type: text/x-diff Content-Disposition: inline; filename=0001-Ensure-that-package-menu-respects-package-install-up.patch >From 8f53ac64620db17a7b163889bb319b621ab97a25 Mon Sep 17 00:00:00 2001 From: Philip Kaludercic Date: Wed, 10 May 2023 08:58:34 +0200 Subject: [PATCH] Ensure that package menu respects 'package-install-upgrade-built-in' * lisp/emacs-lisp/package.el (package-menu--find-upgrades): Check if built-in packages can be upgraded if 'package-install-upgrade-built-in' is non-nil. --- lisp/emacs-lisp/package.el | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/lisp/emacs-lisp/package.el b/lisp/emacs-lisp/package.el index 9476354ebe0..24ba67cef2f 100644 --- a/lisp/emacs-lisp/package.el +++ b/lisp/emacs-lisp/package.el @@ -3731,7 +3731,9 @@ package-menu--find-upgrades ;; ENTRY is (PKG-DESC [NAME VERSION STATUS DOC]) (let ((pkg-desc (car entry)) (status (aref (cadr entry) 2))) - (cond ((member status '("installed" "dependency" "unsigned" "external")) + (cond ((member status (append + '("installed" "dependency" "unsigned" "external" "built-in") + (and package-install-upgrade-built-in '("built-in")))) (push pkg-desc installed)) ((member status '("available" "new")) (setq available (package--append-to-alist pkg-desc available)))))) @@ -3742,6 +3744,8 @@ package-menu--find-upgrades (and avail-pkg (version-list-< (package-desc-priority-version pkg-desc) (package-desc-priority-version avail-pkg)) + (xor (not package-install-upgrade-built-in) + (package--active-built-in-p pkg-desc)) (push (cons name avail-pkg) upgrades)))) upgrades)) -- 2.39.2 --=-=-=--