From unknown Mon Aug 18 21:26:22 2025 X-Loop: help-debbugs@gnu.org Subject: bug#63541: [PATCH] ; Fix use-package :vc keyword when byte-compiled Resent-From: Steven Allen Original-Sender: "Debbugs-submit" Resent-CC: bug-gnu-emacs@gnu.org Resent-Date: Tue, 16 May 2023 23:13:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: report 63541 X-GNU-PR-Package: emacs X-GNU-PR-Keywords: patch To: 63541@debbugs.gnu.org X-Debbugs-Original-To: bug-gnu-emacs@gnu.org Received: via spool by submit@debbugs.gnu.org id=B.168427873714921 (code B ref -1); Tue, 16 May 2023 23:13:01 +0000 Received: (at submit) by debbugs.gnu.org; 16 May 2023 23:12:17 +0000 Received: from localhost ([127.0.0.1]:48225 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pz3q5-0003sb-C5 for submit@debbugs.gnu.org; Tue, 16 May 2023 19:12:17 -0400 Received: from lists.gnu.org ([209.51.188.17]:40434) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pz3q2-0003sS-AI for submit@debbugs.gnu.org; Tue, 16 May 2023 19:12:16 -0400 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 1pz3q1-000451-Aq for bug-gnu-emacs@gnu.org; Tue, 16 May 2023 19:12:13 -0400 Received: from wout3-smtp.messagingengine.com ([64.147.123.19]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1pz3py-00009s-Pg for bug-gnu-emacs@gnu.org; Tue, 16 May 2023 19:12:12 -0400 Received: from compute5.internal (compute5.nyi.internal [10.202.2.45]) by mailout.west.internal (Postfix) with ESMTP id 890503200906 for ; Tue, 16 May 2023 19:12:07 -0400 (EDT) Received: from mailfrontend1 ([10.202.2.162]) by compute5.internal (MEProxy); Tue, 16 May 2023 19:12:07 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=stebalien.com; h=cc:content-transfer-encoding:content-type:date:date:from:from :in-reply-to:message-id:mime-version:reply-to:sender:subject :subject:to:to; s=fm3; t=1684278727; x=1684365127; bh=dqOjyYbvWy FhdZrE6XL/UBrY0iyVIb5P8z8G3TmPKkE=; b=RV1Ha6qSwLnBNSSHejjpmLyWRj 18LHD5Op1I/jPoUCxX4RLY5dXIIhaiKnd3x8XnRLMlw86fumTKabmW6u9Mlww+fG yf9JwD+Cip+eqBDIIx/eyBl8zp1IUVLrQFivl8GkqKmceL86l8JbZZIUVv6syeDY vFeVbfYL/fFLjctT4b0NUYj8rYyAxCyDbHUvvNjMA8XwT2XnEAGv2R8waZ8/pIhQ qqosm+fda+43kk1iXA3Hqb/WUFhGcCPrAsDIHWDkv0A5hYIRqWguHMfGh1XGSTuR fUnPk51l6cbrMLEWUcwP9KQOp6MXmVIIT3ybolDJFwGBLK7hLsM+iPywHVJA== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d= messagingengine.com; h=cc:content-transfer-encoding:content-type :date:date:feedback-id:feedback-id:from:from:in-reply-to :message-id:mime-version:reply-to:sender:subject:subject:to:to :x-me-proxy:x-me-proxy:x-me-sender:x-me-sender:x-sasl-enc; s= fm1; t=1684278727; x=1684365127; bh=dqOjyYbvWyFhdZrE6XL/UBrY0iyV Ib5P8z8G3TmPKkE=; b=ZKndnbWjmSyX7M5Xh0rXuoitDwDtRdLmq9yO8B+v7Rie Ghk0drggMaEckUCX+rPPc9jSdqVwaqsNOASuDmOyrTnDSKs+YwHlXcMDHt+1exAa wYVhFHpg9sLI6GThYjtqG6AwGXquVaH0lWxMsVeJm+rX+flp6LMK11vu/46NpTNG r8C3dtP/uKaA7gehNBJVn7idvsIR59iR1VSDAWiSkEdmHISTqqKmcG1vIrQeCK9X lGiGORyGM7YnmT6KxGNhpQx876B003ZVvcKunbYRheeCIDKkeAxrgIz1WndzPMPq 9hORfQ+Xje8L69+Pym1kcD+bjIgjYjZWn5hoQqsXhw== X-ME-Sender: X-ME-Received: X-ME-Proxy-Cause: gggruggvucftvghtrhhoucdtuddrgedvhedrfeeitddgudefucetufdoteggodetrfdotf fvucfrrhhofhhilhgvmecuhfgrshhtofgrihhlpdfqfgfvpdfurfetoffkrfgpnffqhgen uceurghilhhouhhtmecufedttdenucenucfjughrpefhvffufffkofgggfestdekredtre dttdenucfhrhhomhepufhtvghvvghnucetlhhlvghnuceoshhtvghvvghnsehsthgvsggr lhhivghnrdgtohhmqeenucggtffrrghtthgvrhhnpeetffeujefgtdelieehudffheeihe dtiedtjefftdehvdfhjedvgeekteefvdetvdenucevlhhushhtvghrufhiiigvpedtnecu rfgrrhgrmhepmhgrihhlfhhrohhmpehsthgvvhgvnhesshhtvggsrghlihgvnhdrtghomh X-ME-Proxy: Feedback-ID: ie8a146a7:Fastmail Received: by mail.messagingengine.com (Postfix) with ESMTPA for ; Tue, 16 May 2023 19:12:06 -0400 (EDT) From: Steven Allen Date: Tue, 16 May 2023 16:12:04 -0700 Message-Id: <20230516231204.40043-1-steven@stebalien.com> X-Mailer: git-send-email 2.40.1 MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Received-SPF: pass client-ip=64.147.123.19; envelope-from=steven@stebalien.com; helo=wout3-smtp.messagingengine.com X-Spam_score_int: -27 X-Spam_score: -2.8 X-Spam_bar: -- X-Spam_report: (-2.8 / 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_LOW=-0.7, SPF_HELO_PASS=-0.001, SPF_PASS=-0.001, T_SCC_BODY_TEXT_LINE=-0.01 autolearn=ham autolearn_force=no X-Spam_action: no action X-Spam-Score: -1.6 (-) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -2.6 (--) * lisp/use-package/use-package-core.el (use-package-handler/:vc): Return the new 'body'. Otherwise, the entire package declaration gets dropped when byte-compiling. --- lisp/use-package/use-package-core.el | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/lisp/use-package/use-package-core.el b/lisp/use-package/use-package-core.el index 0d99e270a3f..e0e16134ed3 100644 --- a/lisp/use-package/use-package-core.el +++ b/lisp/use-package/use-package-core.el @@ -1619,7 +1619,8 @@ defvar use-package--form) ;; See `use-package-handler/:ensure' for an explanation. (if (bound-and-true-p byte-compile-current-file) (funcall #'use-package-vc-install arg local-path) ; compile time - (push `(use-package-vc-install ',arg ,local-path) body)))) ; runtime + (push `(use-package-vc-install ',arg ,local-path) body)) ; runtime + body)) (defun use-package-normalize--vc-arg (arg) "Normalize possible arguments to the `:vc' keyword. -- 2.40.1 From unknown Mon Aug 18 21:26:22 2025 X-Loop: help-debbugs@gnu.org Subject: bug#63541: [PATCH] ; Fix use-package :vc keyword when byte-compiled Resent-From: Philip Kaludercic Original-Sender: "Debbugs-submit" Resent-CC: bug-gnu-emacs@gnu.org Resent-Date: Thu, 18 May 2023 19:55:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 63541 X-GNU-PR-Package: emacs X-GNU-PR-Keywords: patch To: Tony Zorman Cc: 63541@debbugs.gnu.org, Steven Allen Received: via spool by 63541-submit@debbugs.gnu.org id=B63541.168443969920222 (code B ref 63541); Thu, 18 May 2023 19:55:02 +0000 Received: (at 63541) by debbugs.gnu.org; 18 May 2023 19:54:59 +0000 Received: from localhost ([127.0.0.1]:54654 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pzjiF-0005G5-7b for submit@debbugs.gnu.org; Thu, 18 May 2023 15:54:59 -0400 Received: from mout01.posteo.de ([185.67.36.65]:40959) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pzjiD-0005FX-4A for 63541@debbugs.gnu.org; Thu, 18 May 2023 15:54:58 -0400 Received: from submission (posteo.de [185.67.36.169]) by mout01.posteo.de (Postfix) with ESMTPS id 96996240027 for <63541@debbugs.gnu.org>; Thu, 18 May 2023 21:54:51 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=posteo.net; s=2017; t=1684439691; bh=5fCPAGZoZpohcVthlQqd7kxAdbmzGQAjQZ2gm21fOAI=; h=From:To:Cc:Subject:Autocrypt:Date:Message-ID:MIME-Version:From; b=rRHP1EOwRzvnlYXREISBILGy+L+Wt2RemWgM66gWVwHoLKbIcxGwkBtCeYowaBS9d KHHOJei8X1faHoi4v8xllPup32Lk1Jo3YOQzH9ttiGfK8Kbzc3PlwRVt6zE1i3OAUL iWq6WO2gBD48tVPzDyCRH5M+f1w072ByO+vk63kZ6BL9vNUCWFXrUqhYWkQu77MirT D5Re4ILJ8vq9i4DI0u+8JWkhhmndnMI9Qg+4+U8qWJrD1oE5M+ZpwPcvttILBDWsnp gm+VZQDPtwvGJHrliSgcvXw/U2dc+W0qtAmi5x/n4Dca8E3vb8cxFQ0lq8WH1cQV2h F9ZKbzmwsprlQ== Received: from customer (localhost [127.0.0.1]) by submission (posteo.de) with ESMTPSA id 4QMgfz1mrjz6twr; Thu, 18 May 2023 21:54:51 +0200 (CEST) From: Philip Kaludercic In-Reply-To: <20230516231204.40043-1-steven@stebalien.com> (Steven Allen's message of "Tue, 16 May 2023 16:12:04 -0700") References: <20230516231204.40043-1-steven@stebalien.com> 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 Date: Thu, 18 May 2023 19:54:50 +0000 Message-ID: <87a5y1za7p.fsf@posteo.net> MIME-Version: 1.0 Content-Type: text/plain X-Spam-Score: -2.3 (--) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -3.3 (---) Steven Allen writes: > * lisp/use-package/use-package-core.el (use-package-handler/:vc): > Return the new 'body'. Otherwise, the entire package declaration gets > dropped when byte-compiling. > --- > lisp/use-package/use-package-core.el | 3 ++- > 1 file changed, 2 insertions(+), 1 deletion(-) > > diff --git a/lisp/use-package/use-package-core.el b/lisp/use-package/use-package-core.el > index 0d99e270a3f..e0e16134ed3 100644 > --- a/lisp/use-package/use-package-core.el > +++ b/lisp/use-package/use-package-core.el > @@ -1619,7 +1619,8 @@ defvar use-package--form) > ;; See `use-package-handler/:ensure' for an explanation. > (if (bound-and-true-p byte-compile-current-file) > (funcall #'use-package-vc-install arg local-path) ; compile time > - (push `(use-package-vc-install ',arg ,local-path) body)))) ; runtime > + (push `(use-package-vc-install ',arg ,local-path) body)) ; runtime > + body)) > > (defun use-package-normalize--vc-arg (arg) > "Normalize possible arguments to the `:vc' keyword. CC'ing Tony, since he did most of the work here. Do you have any comments on this change? From unknown Mon Aug 18 21:26:22 2025 X-Loop: help-debbugs@gnu.org Subject: bug#63541: [PATCH] ; Fix use-package :vc keyword when byte-compiled Resent-From: Tony Zorman Original-Sender: "Debbugs-submit" Resent-CC: bug-gnu-emacs@gnu.org Resent-Date: Fri, 19 May 2023 15:17:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 63541 X-GNU-PR-Package: emacs X-GNU-PR-Keywords: patch To: Philip Kaludercic Cc: 63541@debbugs.gnu.org, Steven Allen Received: via spool by 63541-submit@debbugs.gnu.org id=B63541.16845093982386 (code B ref 63541); Fri, 19 May 2023 15:17:02 +0000 Received: (at 63541) by debbugs.gnu.org; 19 May 2023 15:16:38 +0000 Received: from localhost ([127.0.0.1]:57119 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1q01qP-0000cQ-Ns for submit@debbugs.gnu.org; Fri, 19 May 2023 11:16:38 -0400 Received: from mout-p-201.mailbox.org ([80.241.56.171]:55106) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1q01qN-0000cB-Dg for 63541@debbugs.gnu.org; Fri, 19 May 2023 11:16:36 -0400 Received: from smtp102.mailbox.org (smtp102.mailbox.org [IPv6:2001:67c:2050:b231:465::102]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange ECDHE (P-384) server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by mout-p-201.mailbox.org (Postfix) with ESMTPS id 4QN9RC0ZV4z9sRM; Fri, 19 May 2023 17:16:23 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=mailbox.org; s=mail20150812; t=1684509383; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: in-reply-to:in-reply-to:references:references; bh=ucMnq/JZVajYOE/EOXKk2ilrMY4ii34O/Hk8FRYGvSU=; b=nozYvNXL+w3bJ4/qfpMewHoE7OFTaT+Suk/nA9WuvirDwr2lJ3A7t50ITynimrHuuKyyRb BU+d+lIDaZePyNTtlWJrlPQtMTsiYiMtGQduUkG/nNOI8V+DABtLMntTkCIlBRE4tGeS0T g+NqRdMeTHmHOmPzuRmgwg94CQPuhhGsJuib1sdi+M6E6nR9mAR3ZlT1VnDTG0UbDHR7N/ LaaVKO2mnXFFQt2OPsz1wvNrYKwSV/Sgd4h+AccZfX5gL2iJ/hM8LjGp8A1qaqZW3X1osZ 4R0kCsXFmmd8FQf1kS3Q2Cosa5oh78sIheT8l78JFZIZrPbDhx0Y03ZJpfvSxg== From: Tony Zorman In-Reply-To: <87a5y1za7p.fsf@posteo.net> References: <20230516231204.40043-1-steven@stebalien.com> <87a5y1za7p.fsf@posteo.net> Date: Fri, 19 May 2023 17:16:20 +0200 Message-ID: <87wn14wdvf.fsf@hyperspace> MIME-Version: 1.0 Content-Type: text/plain X-MBO-RS-META: qquhyst9jc97szmhtu6qro531qjopa6r X-MBO-RS-ID: a1ad1861422dba3ae99 X-Spam-Score: -0.7 (/) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.7 (-) On Thu, May 18 2023 19:54, Philip Kaludercic wrote: > Steven Allen writes: > >> * lisp/use-package/use-package-core.el (use-package-handler/:vc): >> Return the new 'body'. Otherwise, the entire package declaration gets >> dropped when byte-compiling. >> --- >> lisp/use-package/use-package-core.el | 3 ++- >> 1 file changed, 2 insertions(+), 1 deletion(-) >> >> diff --git a/lisp/use-package/use-package-core.el b/lisp/use-package/use-package-core.el >> index 0d99e270a3f..e0e16134ed3 100644 >> --- a/lisp/use-package/use-package-core.el >> +++ b/lisp/use-package/use-package-core.el >> @@ -1619,7 +1619,8 @@ defvar use-package--form) >> ;; See `use-package-handler/:ensure' for an explanation. >> (if (bound-and-true-p byte-compile-current-file) >> (funcall #'use-package-vc-install arg local-path) ; compile time >> - (push `(use-package-vc-install ',arg ,local-path) body)))) ; runtime >> + (push `(use-package-vc-install ',arg ,local-path) body)) ; runtime >> + body)) >> >> (defun use-package-normalize--vc-arg (arg) >> "Normalize possible arguments to the `:vc' keyword. > > CC'ing Tony, since he did most of the work here. Do you have any > comments on this change? Looks fine to me; @Steven thanks for catching this! Seems like I wasn't careful enough when testing with a byte compiled file. I'm not super familiar with the testing infrastructure here, but I wonder whether there is an easy way to write a quick regression test for this? -- Tony Zorman | https://tony-zorman.com/ From unknown Mon Aug 18 21:26:22 2025 X-Loop: help-debbugs@gnu.org Subject: bug#63541: [PATCH] ; Fix use-package :vc keyword when byte-compiled Resent-From: Philip Kaludercic Original-Sender: "Debbugs-submit" Resent-CC: bug-gnu-emacs@gnu.org Resent-Date: Sat, 20 May 2023 16:51:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 63541 X-GNU-PR-Package: emacs X-GNU-PR-Keywords: patch To: Tony Zorman Cc: 63541@debbugs.gnu.org, Steven Allen Received: via spool by 63541-submit@debbugs.gnu.org id=B63541.168460142826423 (code B ref 63541); Sat, 20 May 2023 16:51:02 +0000 Received: (at 63541) by debbugs.gnu.org; 20 May 2023 16:50:28 +0000 Received: from localhost ([127.0.0.1]:59286 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1q0Pmm-0006s6-3i for submit@debbugs.gnu.org; Sat, 20 May 2023 12:50:28 -0400 Received: from mout02.posteo.de ([185.67.36.66]:52639) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1q0Pmj-0006ro-8k for 63541@debbugs.gnu.org; Sat, 20 May 2023 12:50:26 -0400 Received: from submission (posteo.de [185.67.36.169]) by mout02.posteo.de (Postfix) with ESMTPS id BAD76240103 for <63541@debbugs.gnu.org>; Sat, 20 May 2023 18:50:19 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=posteo.net; s=2017; t=1684601419; bh=PTqdBWCoZ1jFvTJ15HoCDaVXz5lcI7Ow2ZOLWEk2TGo=; h=From:To:Cc:Subject:Autocrypt:Date:Message-ID:MIME-Version:From; b=SL7RBEyyAxceW3ltKfSM8Yk82377vy8OvVMON+ChuOEheH2bBARrNpR61BTBQx3ap q6FtyPF21f+Txxgp190sa9zFCjxtV5MAKwydv+P5DrPb+jg+bIvqwYRUcNMpAErwK1 faxoTiRljnWajafZvaMqVA+Q/JClkCM6GNcD/ClbBftL3YIF9NFmIA/NUAYI+udUeZ 2NJ1jopihwsw4WjMhNh/jIwipt6O8A5xCbTjyaEHxU75qYz+exOkD42Cb+b7dIsvu4 lZnZl4sRTCZk9qmlVt1w/zKRVXvGYN11OFjYnij6DFuVpZZkUuIDnhVfYjUohrOLKW yTxvJbmp56OtQ== Received: from customer (localhost [127.0.0.1]) by submission (posteo.de) with ESMTPSA id 4QNqT71fk6z6tx3; Sat, 20 May 2023 18:50:19 +0200 (CEST) From: Philip Kaludercic In-Reply-To: <87wn14wdvf.fsf@hyperspace> (Tony Zorman's message of "Fri, 19 May 2023 17:16:20 +0200") References: <20230516231204.40043-1-steven@stebalien.com> <87a5y1za7p.fsf@posteo.net> <87wn14wdvf.fsf@hyperspace> 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 Date: Sat, 20 May 2023 16:50:18 +0000 Message-ID: <87wn137xrp.fsf@posteo.net> MIME-Version: 1.0 Content-Type: text/plain X-Spam-Score: -2.3 (--) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -3.3 (---) Tony Zorman writes: > On Thu, May 18 2023 19:54, Philip Kaludercic wrote: >> Steven Allen writes: >> >>> * lisp/use-package/use-package-core.el (use-package-handler/:vc): >>> Return the new 'body'. Otherwise, the entire package declaration gets >>> dropped when byte-compiling. >>> --- >>> lisp/use-package/use-package-core.el | 3 ++- >>> 1 file changed, 2 insertions(+), 1 deletion(-) >>> >>> diff --git a/lisp/use-package/use-package-core.el b/lisp/use-package/use-package-core.el >>> index 0d99e270a3f..e0e16134ed3 100644 >>> --- a/lisp/use-package/use-package-core.el >>> +++ b/lisp/use-package/use-package-core.el >>> @@ -1619,7 +1619,8 @@ defvar use-package--form) >>> ;; See `use-package-handler/:ensure' for an explanation. >>> (if (bound-and-true-p byte-compile-current-file) >>> (funcall #'use-package-vc-install arg local-path) ; compile time >>> - (push `(use-package-vc-install ',arg ,local-path) body)))) ; runtime >>> + (push `(use-package-vc-install ',arg ,local-path) body)) ; runtime >>> + body)) >>> >>> (defun use-package-normalize--vc-arg (arg) >>> "Normalize possible arguments to the `:vc' keyword. >> >> CC'ing Tony, since he did most of the work here. Do you have any >> comments on this change? > > Looks fine to me; @Steven thanks for catching this! Seems like I wasn't > careful enough when testing with a byte compiled file. OK, I'll apply it in that case. > I'm not super familiar with the testing infrastructure here, but I > wonder whether there is an easy way to write a quick regression test for > this? I'm not a professional software engineer, so I don't know what this means :/ From unknown Mon Aug 18 21:26:22 2025 X-Loop: help-debbugs@gnu.org Subject: bug#63541: [PATCH] ; Fix use-package :vc keyword when byte-compiled Resent-From: Tony Zorman Original-Sender: "Debbugs-submit" Resent-CC: bug-gnu-emacs@gnu.org Resent-Date: Sun, 21 May 2023 09:33:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 63541 X-GNU-PR-Package: emacs X-GNU-PR-Keywords: patch To: Philip Kaludercic Cc: 63541@debbugs.gnu.org, Steven Allen Received: via spool by 63541-submit@debbugs.gnu.org id=B63541.168466153916077 (code B ref 63541); Sun, 21 May 2023 09:33:01 +0000 Received: (at 63541) by debbugs.gnu.org; 21 May 2023 09:32:19 +0000 Received: from localhost ([127.0.0.1]:60031 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1q0fQJ-0004BB-0N for submit@debbugs.gnu.org; Sun, 21 May 2023 05:32:19 -0400 Received: from mout-p-103.mailbox.org ([80.241.56.161]:57880) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1q0fQG-0004An-BZ for 63541@debbugs.gnu.org; Sun, 21 May 2023 05:32:18 -0400 Received: from smtp202.mailbox.org (smtp202.mailbox.org [IPv6:2001:67c:2050:b231:465::202]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange ECDHE (P-384) server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by mout-p-103.mailbox.org (Postfix) with ESMTPS id 4QPFhz6NJnz9sTL; Sun, 21 May 2023 11:32:03 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=mailbox.org; s=mail20150812; t=1684661523; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=NtQOyiZRaET4CQFQ96A8RYgx1wlqqykiQWPmCavAP0Y=; b=B+WqltQnlk9Yki96AjOQL3f1jCmFqPnoBwA5P0gS/LRleIcOZXzjhf04CNuR8WtaTGaY7n dLZLrnGzJa/Yh5La1PDnb/pnb8WfR60WPtHNiSWxtQw1JTfKgUCu6Lji4BR9Bzd5JmeC1O nhKCd0jorfUobAb89tJsD2t0VA5zbPSbnfC5eKVbIqPfi1KKSl7F9UP0I6tGddqeUMEuYu q+UTwyYDE8ehZqVuVOSNwiNrbxRaEvTwmYjODl+D//kb7QbegOR9ERMCRyfbxTmAsPS00c nlKaoEDG5UMgy9X3RskfMhxw3e8Va9TvUQn7r2Nf8A3RGfoKZA6hGsbKEVZ4yg== From: Tony Zorman In-Reply-To: <87wn137xrp.fsf@posteo.net> References: <20230516231204.40043-1-steven@stebalien.com> <87a5y1za7p.fsf@posteo.net> <87wn14wdvf.fsf@hyperspace> <87wn137xrp.fsf@posteo.net> Date: Sun, 21 May 2023 11:32:00 +0200 Message-ID: <874jo6owrz.fsf@hyperspace> MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable X-MBO-RS-META: rnc7d6cfanpthkryubuxxojwhb4b1efg X-MBO-RS-ID: 01b4f0c07eb1738066e X-Spam-Score: -0.7 (/) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.7 (-) On Sat, May 20 2023 16:50, Philip Kaludercic wrote: >> I'm not super familiar with the testing infrastructure here, but I >> wonder whether there is an easy way to write a quick regression test for >> this? > > I'm not a professional software engineer, Me neither, so don't worry about it :) > so I don't know what this means :/ Basically, I was wondering whether it'd be possible to write a test that byte compiles some statement and then checks the relevant expansion of the macro. This way, whenever the (now correct) code changes in the future (for whatever reason=E2=80=94most likely a refactor, I guess), one c= ould verify that the functionality wasn't inadvertently broken again. --=20 Tony Zorman | https://tony-zorman.com/ From unknown Mon Aug 18 21:26:22 2025 X-Loop: help-debbugs@gnu.org Subject: bug#63541: [PATCH] ; Fix use-package :vc keyword when byte-compiled Resent-From: Steven Allen Original-Sender: "Debbugs-submit" Resent-CC: bug-gnu-emacs@gnu.org Resent-Date: Fri, 26 May 2023 04:55:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 63541 X-GNU-PR-Package: emacs X-GNU-PR-Keywords: patch To: Tony Zorman Cc: 63541@debbugs.gnu.org Received: via spool by 63541-submit@debbugs.gnu.org id=B63541.168507688313752 (code B ref 63541); Fri, 26 May 2023 04:55:01 +0000 Received: (at 63541) by debbugs.gnu.org; 26 May 2023 04:54:43 +0000 Received: from localhost ([127.0.0.1]:48556 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1q2PTO-0003Zj-ML for submit@debbugs.gnu.org; Fri, 26 May 2023 00:54:43 -0400 Received: from wout1-smtp.messagingengine.com ([64.147.123.24]:34199) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1q2PTL-0003ZR-Ht for 63541@debbugs.gnu.org; Fri, 26 May 2023 00:54:40 -0400 Received: from compute4.internal (compute4.nyi.internal [10.202.2.44]) by mailout.west.internal (Postfix) with ESMTP id 8DD423200923; Fri, 26 May 2023 00:54:31 -0400 (EDT) Received: from mailfrontend1 ([10.202.2.162]) by compute4.internal (MEProxy); Fri, 26 May 2023 00:54:31 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=stebalien.com; h=cc:cc:content-type:content-type:date:date:from:from :in-reply-to:in-reply-to:message-id:mime-version:references :reply-to:sender:subject:subject:to:to; s=fm3; t=1685076871; x= 1685163271; bh=M7qGdQwSNNAOFx4KS3/OxU0iSlRrmSHCp9bE0d+7Ja0=; b=M rWdubg3+66GXQcgJMQ+lupY855qgEM+e1Q1zWnTWXgj+J1vwjh6cvuvn8Ywc4Oae t1IdF9AIVJdPEvI8oyUApCzX3Qx/R8HeP1G4B5i9JToQyXrb2xSfRO4QXJmFlqxU xlYClys8urDFt30a1D8cL7PdovNVmgzA6iyfZULRnap0om/CXyDKkpwdcZMKVhH/ dBzu4lGLrC903VddZS8Bzq/FukxqVr61oRuAttNAL1dDilLiJHHazH+K7MS/SYkQ uRfkXRlm8M2GvfuWOlUcbFe8KnobDedxXMmRqS1lUQDoM94no/mJfoaw51lFD+79 ZnV2RAExfSK3jQs34S7XA== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d= messagingengine.com; h=cc:cc:content-type:content-type:date:date :feedback-id:feedback-id:from:from:in-reply-to:in-reply-to :message-id:mime-version:references:reply-to:sender:subject :subject:to:to:x-me-proxy:x-me-proxy:x-me-sender:x-me-sender :x-sasl-enc; s=fm1; t=1685076871; x=1685163271; bh=M7qGdQwSNNAOF x4KS3/OxU0iSlRrmSHCp9bE0d+7Ja0=; b=iUsgtZRKPdBHp37VAS2S00VvCYUqP /jjlfP66H+7bjPApR3rMm+/2ATFdNq2V+D/oT8CmgzwajwHyAjJ/rwLvOzmQ0yZ/ DpjxRDJ+z2yfxtKD1CJU5FRaJaVwz8byv1bV6AW9riJuk6AfRh5/Kag1RFPvhMvb 7HjgikPYRTZ9aASn5iC9kzvcliow5FvcwT5hFFFfIUZy0WtbVNLpuyMSh1VVKOiZ 2lnq936Um1jtE4ozuDpuRPr8E1wLoXoNuDrF0uTNk1RCt0xHttCoIftKWrqNZH6P 5Y5++4TvUwvtlSThrzPwS6Se+zDDfqfYVrntskFGfUgDWr1PGzTGW2ZfA== X-ME-Sender: X-ME-Received: X-ME-Proxy-Cause: gggruggvucftvghtrhhoucdtuddrgedvhedrfeejkedgkeelucetufdoteggodetrfdotf fvucfrrhhofhhilhgvmecuhfgrshhtofgrihhlpdfqfgfvpdfurfetoffkrfgpnffqhgen uceurghilhhouhhtmecufedttdenucenucfjughrpefhvfevufgjfhffkfggtgesmhdtre ertddttdenucfhrhhomhepufhtvghvvghnucetlhhlvghnuceoshhtvghvvghnsehsthgv sggrlhhivghnrdgtohhmqeenucggtffrrghtthgvrhhnpeejudefvdeijeeukedttdegud egffevjeehheeiueelgfffhfelffehfeevhfdvgeenucevlhhushhtvghrufhiiigvpedt necurfgrrhgrmhepmhgrihhlfhhrohhmpehsthgvvhgvnhesshhtvggsrghlihgvnhdrtg homh X-ME-Proxy: Feedback-ID: ie8a146a7:Fastmail Received: by mail.messagingengine.com (Postfix) with ESMTPA; Fri, 26 May 2023 00:54:30 -0400 (EDT) From: Steven Allen In-Reply-To: <874jo6owrz.fsf@hyperspace> References: <20230516231204.40043-1-steven@stebalien.com> <87a5y1za7p.fsf@posteo.net> <87wn14wdvf.fsf@hyperspace> <87wn137xrp.fsf@posteo.net> <874jo6owrz.fsf@hyperspace> Date: Thu, 25 May 2023 21:54:29 -0700 Message-ID: <875y8fzo8q.fsf@stebalien.com> MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="=-=-=" X-Spam-Score: -0.7 (/) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.7 (-) --=-=-= Content-Type: text/plain Content-Disposition: inline Here's a version of the patch with a test. (sent to the right list this time) --=-=-= Content-Type: text/x-patch Content-Disposition: attachment; filename=0001-Fix-use-package-vc-keyword-when-byte-compiled.patch Content-Description: 0001-Fix-use-package-vc-keyword-when-byte-compiled.patch >From fee8eb4e81f8d541301bdbe74d7090bc5f27e455 Mon Sep 17 00:00:00 2001 From: Steven Allen Date: Tue, 16 May 2023 16:07:36 -0700 Subject: [PATCH] ; Fix use-package :vc keyword when byte-compiled * lisp/use-package/use-package-core.el (use-package-handler/:vc): Return the new 'body'. Otherwise, the entire package declaration gets dropped when byte-compiling. * test/lisp/use-package/use-package-tests.el (use-package-test-handler/:vc-6): test it. --- lisp/use-package/use-package-core.el | 3 ++- test/lisp/use-package/use-package-tests.el | 11 +++++++++++ 2 files changed, 13 insertions(+), 1 deletion(-) diff --git a/lisp/use-package/use-package-core.el b/lisp/use-package/use-package-core.el index 0d99e270a3f..e0e16134ed3 100644 --- a/lisp/use-package/use-package-core.el +++ b/lisp/use-package/use-package-core.el @@ -1619,7 +1619,8 @@ use-package-handler/:vc ;; See `use-package-handler/:ensure' for an explanation. (if (bound-and-true-p byte-compile-current-file) (funcall #'use-package-vc-install arg local-path) ; compile time - (push `(use-package-vc-install ',arg ,local-path) body)))) ; runtime + (push `(use-package-vc-install ',arg ,local-path) body)) ; runtime + body)) (defun use-package-normalize--vc-arg (arg) "Normalize possible arguments to the `:vc' keyword. diff --git a/test/lisp/use-package/use-package-tests.el b/test/lisp/use-package/use-package-tests.el index c8c20fc51cb..9181a8171a7 100644 --- a/test/lisp/use-package/use-package-tests.el +++ b/test/lisp/use-package/use-package-tests.el @@ -1991,6 +1991,17 @@ use-package-test/:vc-5 (use-package-vc-install '(other-name) ,load-path?) (require 'foo nil nil))))) +(ert-deftest use-package-test-handler/:vc-6 () + (let ((byte-compile-current-file "use-package-core.el") + tried-to-install) + (cl-letf (((symbol-function #'use-package-vc-install) + (lambda (arg &optional local-path) + (setq tried-to-install arg)))) + (should (equal + (use-package-handler/:vc 'foo nil 'some-pkg '(:init (foo)) nil) + '(foo))) + (should (eq tried-to-install 'some-pkg))))) + (ert-deftest use-package-test-normalize/:vc () (should (equal '(foo "version-string") (use-package-normalize/:vc 'foo :vc '("version-string")))) -- 2.40.1 --=-=-=-- From unknown Mon Aug 18 21:26:22 2025 X-Loop: help-debbugs@gnu.org Subject: bug#63541: [PATCH] ; Fix use-package :vc keyword when byte-compiled Resent-From: Eli Zaretskii Original-Sender: "Debbugs-submit" Resent-CC: bug-gnu-emacs@gnu.org Resent-Date: Wed, 31 May 2023 13:23:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 63541 X-GNU-PR-Package: emacs X-GNU-PR-Keywords: patch To: Steven Allen , Philip Kaludercic Cc: soliditsallgood@mailbox.org, 63541@debbugs.gnu.org Received: via spool by 63541-submit@debbugs.gnu.org id=B63541.16855393711204 (code B ref 63541); Wed, 31 May 2023 13:23:02 +0000 Received: (at 63541) by debbugs.gnu.org; 31 May 2023 13:22:51 +0000 Received: from localhost ([127.0.0.1]:35112 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1q4Lmt-0000JL-Ed for submit@debbugs.gnu.org; Wed, 31 May 2023 09:22:51 -0400 Received: from eggs.gnu.org ([209.51.188.92]:33332) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1q4Lmq-0000J8-UI for 63541@debbugs.gnu.org; Wed, 31 May 2023 09:22:49 -0400 Received: from fencepost.gnu.org ([2001:470:142:3::e]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1q4Lmj-00046n-JI; Wed, 31 May 2023 09:22:41 -0400 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=gnu.org; s=fencepost-gnu-org; h=References:Subject:In-Reply-To:To:From:Date: mime-version; bh=c/toXEmgYnvQo/0+Yehpxr62nv2hWRS8b5uxCvLa5IM=; b=lqDqj+AKui5N HDKYbgw33tLAGnJHMX9Rr1yFfYWeQ6vTIA5B2wXgy2G2MYIOiFUoj2NxOELHrwhvz/J9zDQPJjX8N z6IbQoFSIF9oufB2y71/vEXHinzxTwiViGOtRgp7sGBSSj7hllFWwTBNA+JJu+Is+TFJ08IkZTLwN CelrWrCq7vgwHYt7ByiVl2ZfeRvdxCTqpUwJRkNAfZLAe6x2VP+C/rQ8W3REHVdVNTlWqd5ZzxL6i KMQFbKyv35uJPzDnY7L9dlW3Ouk7pn3yq+UZIwhQZS0M5IklAy6y3HRP0wXS8pGaEg84gr6Tjwm1J rbKEnsiddxCHBajUykpFZQ==; Received: from [87.69.77.57] (helo=home-c4e4a596f7) by fencepost.gnu.org with esmtpsa (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1q4Lmb-0002Hs-SR; Wed, 31 May 2023 09:22:36 -0400 Date: Wed, 31 May 2023 16:23:18 +0300 Message-Id: <83zg5keit5.fsf@gnu.org> From: Eli Zaretskii In-Reply-To: <875y8fzo8q.fsf@stebalien.com> (message from Steven Allen on Thu, 25 May 2023 21:54:29 -0700) References: <20230516231204.40043-1-steven@stebalien.com> <87a5y1za7p.fsf@posteo.net> <87wn14wdvf.fsf@hyperspace> <87wn137xrp.fsf@posteo.net> <874jo6owrz.fsf@hyperspace> <875y8fzo8q.fsf@stebalien.com> X-Spam-Score: -2.3 (--) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -3.3 (---) > Cc: 63541@debbugs.gnu.org > From: Steven Allen > Date: Thu, 25 May 2023 21:54:29 -0700 > > Here's a version of the patch with a test. Philip, should I install this? From unknown Mon Aug 18 21:26:22 2025 X-Loop: help-debbugs@gnu.org Subject: bug#63541: [PATCH] ; Fix use-package :vc keyword when byte-compiled Resent-From: Philip Kaludercic Original-Sender: "Debbugs-submit" Resent-CC: bug-gnu-emacs@gnu.org Resent-Date: Wed, 31 May 2023 21:54:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 63541 X-GNU-PR-Package: emacs X-GNU-PR-Keywords: patch To: Eli Zaretskii Cc: soliditsallgood@mailbox.org, 63541@debbugs.gnu.org, Steven Allen Received: via spool by 63541-submit@debbugs.gnu.org id=B63541.168557003231717 (code B ref 63541); Wed, 31 May 2023 21:54:02 +0000 Received: (at 63541) by debbugs.gnu.org; 31 May 2023 21:53:52 +0000 Received: from localhost ([127.0.0.1]:36475 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1q4TlQ-0008FU-Gf for submit@debbugs.gnu.org; Wed, 31 May 2023 17:53:52 -0400 Received: from mout02.posteo.de ([185.67.36.66]:46213) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1q4TlN-0008FE-9z for 63541@debbugs.gnu.org; Wed, 31 May 2023 17:53:50 -0400 Received: from submission (posteo.de [185.67.36.169]) by mout02.posteo.de (Postfix) with ESMTPS id 224C3240104 for <63541@debbugs.gnu.org>; Wed, 31 May 2023 23:53:43 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=posteo.net; s=2017; t=1685570023; bh=dkkqDZp/BhG1I0xMWMfWRt4eWDEzsIELg4R0C77Eow8=; h=From:To:Cc:Subject:Autocrypt:Date:Message-ID:MIME-Version:From; b=OVn/PrTudUzVqs2QGfimVwXAhqRFYd6zPzvsh7FgzoXTwnjKC4DrdeIaKiaZOViHK BxlJtxP23jHRVV5gPimbwAa1j8jyTqrwk6Py3Fwv5Jpp1I5taolSStZEGXwQrXatW/ R+uFKHzL30KmYkXhwECBKuaf/soLzZbkk5tzSlO/PWPRbLAWzderAmYbs5onsaAqKx +AJocUTDUhBHxsyX0ZwILBgnKzTi3paOp0+3mjdwKJLgIbv1G63UAE8izN6CaM7oLP bHTkAnj5KZyPZ4Yo1x6Uwppslh0GjP3ZxFyDGpbMWYF6K5RBBPx8Go8WCegm8lWHMe OhELDw40biUyg== Received: from customer (localhost [127.0.0.1]) by submission (posteo.de) with ESMTPSA id 4QWjh63PNFz6tvk; Wed, 31 May 2023 23:53:42 +0200 (CEST) From: Philip Kaludercic In-Reply-To: <83zg5keit5.fsf@gnu.org> (Eli Zaretskii's message of "Wed, 31 May 2023 16:23:18 +0300") References: <20230516231204.40043-1-steven@stebalien.com> <87a5y1za7p.fsf@posteo.net> <87wn14wdvf.fsf@hyperspace> <87wn137xrp.fsf@posteo.net> <874jo6owrz.fsf@hyperspace> <875y8fzo8q.fsf@stebalien.com> <83zg5keit5.fsf@gnu.org> 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 Date: Wed, 31 May 2023 21:53:41 +0000 Message-ID: <874jnsyxp6.fsf@posteo.net> MIME-Version: 1.0 Content-Type: text/plain X-Spam-Score: -2.3 (--) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -3.3 (---) Eli Zaretskii writes: >> Cc: 63541@debbugs.gnu.org >> From: Steven Allen >> Date: Thu, 25 May 2023 21:54:29 -0700 >> >> Here's a version of the patch with a test. > > Philip, should I install this? I don't value my own input, since this is related to use-package which I do not use, but from a general intuition it looks fine. From unknown Mon Aug 18 21:26:22 2025 MIME-Version: 1.0 X-Mailer: MIME-tools 5.505 (Entity 5.505) X-Loop: help-debbugs@gnu.org From: help-debbugs@gnu.org (GNU bug Tracking System) To: Steven Allen Subject: bug#63541: closed (Re: bug#63541: [PATCH] ; Fix use-package :vc keyword when byte-compiled) Message-ID: References: <837csl9f7w.fsf@gnu.org> <20230516231204.40043-1-steven@stebalien.com> X-Gnu-PR-Message: they-closed 63541 X-Gnu-PR-Package: emacs X-Gnu-PR-Keywords: patch Reply-To: 63541@debbugs.gnu.org Date: Sat, 03 Jun 2023 07:29:02 +0000 Content-Type: multipart/mixed; boundary="----------=_1685777342-17137-1" This is a multi-part message in MIME format... ------------=_1685777342-17137-1 Content-Disposition: inline Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" Your bug report #63541: [PATCH] ; Fix use-package :vc keyword when byte-compiled which was filed against the emacs package, has been closed. The explanation is attached below, along with your original report. If you require more details, please reply to 63541@debbugs.gnu.org. --=20 63541: https://debbugs.gnu.org/cgi/bugreport.cgi?bug=3D63541 GNU Bug Tracking System Contact help-debbugs@gnu.org with problems ------------=_1685777342-17137-1 Content-Type: message/rfc822 Content-Disposition: inline Content-Transfer-Encoding: 7bit Received: (at 63541-done) by debbugs.gnu.org; 3 Jun 2023 07:28:12 +0000 Received: from localhost ([127.0.0.1]:41466 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1q5LgJ-0004Qt-GU for submit@debbugs.gnu.org; Sat, 03 Jun 2023 03:28:11 -0400 Received: from eggs.gnu.org ([209.51.188.92]:47418) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1q5LgG-0004QY-Js for 63541-done@debbugs.gnu.org; Sat, 03 Jun 2023 03:28:10 -0400 Received: from fencepost.gnu.org ([2001:470:142:3::e]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1q5Lg9-0003hs-H6; Sat, 03 Jun 2023 03:28:01 -0400 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=gnu.org; s=fencepost-gnu-org; h=References:Subject:In-Reply-To:To:From:Date: mime-version; bh=tbD6LKp82OTP2+mShVq7sRQyn9kGFTFd/fpzqNQkc2A=; b=GaEwrNVE6BUu ZyYncXNmfImiVNLMz2KsGkYHsWhcsAqYv6ZTYMNqufB/E2XHQ4QdB3VUcVM1B3jZehmeOpyVX9oVS +1Z6SSBeoNo8Sk+BMN6uWpVaNOnxjyIy60Qi7tJ6g7t/KMxm7EGnSGJtuK1w6Tmixg9nVXBppflF7 srDeiMCC1R071XuWGkjXPkkflvjYwtH+mSXqvuTWuuTSe3qsB2T1N/dzgCteGW7j47z931txozQA1 8KEiHmq7f3GiqiBWddLArU6AmzADcUJUMU4+5mFvhdFe9BUb32Mw71MFEwxjtfRj4dPeZ4/gL1gvL l0V0m9/m7n5qIL71YfkH6g==; Received: from [87.69.77.57] (helo=home-c4e4a596f7) by fencepost.gnu.org with esmtpsa (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1q5Lg9-00020X-07; Sat, 03 Jun 2023 03:28:01 -0400 Date: Sat, 03 Jun 2023 10:28:51 +0300 Message-Id: <837csl9f7w.fsf@gnu.org> From: Eli Zaretskii To: Philip Kaludercic In-Reply-To: <874jnsyxp6.fsf@posteo.net> (message from Philip Kaludercic on Wed, 31 May 2023 21:53:41 +0000) Subject: Re: bug#63541: [PATCH] ; Fix use-package :vc keyword when byte-compiled References: <20230516231204.40043-1-steven@stebalien.com> <87a5y1za7p.fsf@posteo.net> <87wn14wdvf.fsf@hyperspace> <87wn137xrp.fsf@posteo.net> <874jo6owrz.fsf@hyperspace> <875y8fzo8q.fsf@stebalien.com> <83zg5keit5.fsf@gnu.org> <874jnsyxp6.fsf@posteo.net> X-Spam-Score: -2.3 (--) X-Debbugs-Envelope-To: 63541-done Cc: soliditsallgood@mailbox.org, 63541-done@debbugs.gnu.org, steven@stebalien.com X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -3.3 (---) > From: Philip Kaludercic > Cc: Steven Allen , soliditsallgood@mailbox.org, > 63541@debbugs.gnu.org > Date: Wed, 31 May 2023 21:53:41 +0000 > > Eli Zaretskii writes: > > >> Cc: 63541@debbugs.gnu.org > >> From: Steven Allen > >> Date: Thu, 25 May 2023 21:54:29 -0700 > >> > >> Here's a version of the patch with a test. > > > > Philip, should I install this? > > I don't value my own input, since this is related to use-package which I > do not use, but from a general intuition it looks fine. Thanks for the feedback. I've now installed this on the master branch, and I'm closing the bug. ------------=_1685777342-17137-1 Content-Type: message/rfc822 Content-Disposition: inline Content-Transfer-Encoding: 7bit Received: (at submit) by debbugs.gnu.org; 16 May 2023 23:12:17 +0000 Received: from localhost ([127.0.0.1]:48225 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pz3q5-0003sb-C5 for submit@debbugs.gnu.org; Tue, 16 May 2023 19:12:17 -0400 Received: from lists.gnu.org ([209.51.188.17]:40434) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pz3q2-0003sS-AI for submit@debbugs.gnu.org; Tue, 16 May 2023 19:12:16 -0400 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 1pz3q1-000451-Aq for bug-gnu-emacs@gnu.org; Tue, 16 May 2023 19:12:13 -0400 Received: from wout3-smtp.messagingengine.com ([64.147.123.19]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1pz3py-00009s-Pg for bug-gnu-emacs@gnu.org; Tue, 16 May 2023 19:12:12 -0400 Received: from compute5.internal (compute5.nyi.internal [10.202.2.45]) by mailout.west.internal (Postfix) with ESMTP id 890503200906 for ; Tue, 16 May 2023 19:12:07 -0400 (EDT) Received: from mailfrontend1 ([10.202.2.162]) by compute5.internal (MEProxy); Tue, 16 May 2023 19:12:07 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=stebalien.com; h=cc:content-transfer-encoding:content-type:date:date:from:from :in-reply-to:message-id:mime-version:reply-to:sender:subject :subject:to:to; s=fm3; t=1684278727; x=1684365127; bh=dqOjyYbvWy FhdZrE6XL/UBrY0iyVIb5P8z8G3TmPKkE=; b=RV1Ha6qSwLnBNSSHejjpmLyWRj 18LHD5Op1I/jPoUCxX4RLY5dXIIhaiKnd3x8XnRLMlw86fumTKabmW6u9Mlww+fG yf9JwD+Cip+eqBDIIx/eyBl8zp1IUVLrQFivl8GkqKmceL86l8JbZZIUVv6syeDY vFeVbfYL/fFLjctT4b0NUYj8rYyAxCyDbHUvvNjMA8XwT2XnEAGv2R8waZ8/pIhQ qqosm+fda+43kk1iXA3Hqb/WUFhGcCPrAsDIHWDkv0A5hYIRqWguHMfGh1XGSTuR fUnPk51l6cbrMLEWUcwP9KQOp6MXmVIIT3ybolDJFwGBLK7hLsM+iPywHVJA== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d= messagingengine.com; h=cc:content-transfer-encoding:content-type :date:date:feedback-id:feedback-id:from:from:in-reply-to :message-id:mime-version:reply-to:sender:subject:subject:to:to :x-me-proxy:x-me-proxy:x-me-sender:x-me-sender:x-sasl-enc; s= fm1; t=1684278727; x=1684365127; bh=dqOjyYbvWyFhdZrE6XL/UBrY0iyV Ib5P8z8G3TmPKkE=; b=ZKndnbWjmSyX7M5Xh0rXuoitDwDtRdLmq9yO8B+v7Rie Ghk0drggMaEckUCX+rPPc9jSdqVwaqsNOASuDmOyrTnDSKs+YwHlXcMDHt+1exAa wYVhFHpg9sLI6GThYjtqG6AwGXquVaH0lWxMsVeJm+rX+flp6LMK11vu/46NpTNG r8C3dtP/uKaA7gehNBJVn7idvsIR59iR1VSDAWiSkEdmHISTqqKmcG1vIrQeCK9X lGiGORyGM7YnmT6KxGNhpQx876B003ZVvcKunbYRheeCIDKkeAxrgIz1WndzPMPq 9hORfQ+Xje8L69+Pym1kcD+bjIgjYjZWn5hoQqsXhw== X-ME-Sender: X-ME-Received: X-ME-Proxy-Cause: gggruggvucftvghtrhhoucdtuddrgedvhedrfeeitddgudefucetufdoteggodetrfdotf fvucfrrhhofhhilhgvmecuhfgrshhtofgrihhlpdfqfgfvpdfurfetoffkrfgpnffqhgen uceurghilhhouhhtmecufedttdenucenucfjughrpefhvffufffkofgggfestdekredtre dttdenucfhrhhomhepufhtvghvvghnucetlhhlvghnuceoshhtvghvvghnsehsthgvsggr lhhivghnrdgtohhmqeenucggtffrrghtthgvrhhnpeetffeujefgtdelieehudffheeihe dtiedtjefftdehvdfhjedvgeekteefvdetvdenucevlhhushhtvghrufhiiigvpedtnecu rfgrrhgrmhepmhgrihhlfhhrohhmpehsthgvvhgvnhesshhtvggsrghlihgvnhdrtghomh X-ME-Proxy: Feedback-ID: ie8a146a7:Fastmail Received: by mail.messagingengine.com (Postfix) with ESMTPA for ; Tue, 16 May 2023 19:12:06 -0400 (EDT) From: Steven Allen To: bug-gnu-emacs@gnu.org Subject: [PATCH] ; Fix use-package :vc keyword when byte-compiled Date: Tue, 16 May 2023 16:12:04 -0700 Message-Id: <20230516231204.40043-1-steven@stebalien.com> X-Mailer: git-send-email 2.40.1 MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Received-SPF: pass client-ip=64.147.123.19; envelope-from=steven@stebalien.com; helo=wout3-smtp.messagingengine.com X-Spam_score_int: -27 X-Spam_score: -2.8 X-Spam_bar: -- X-Spam_report: (-2.8 / 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_LOW=-0.7, SPF_HELO_PASS=-0.001, SPF_PASS=-0.001, T_SCC_BODY_TEXT_LINE=-0.01 autolearn=ham autolearn_force=no X-Spam_action: no action X-Spam-Score: -1.6 (-) X-Debbugs-Envelope-To: submit X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -2.6 (--) * lisp/use-package/use-package-core.el (use-package-handler/:vc): Return the new 'body'. Otherwise, the entire package declaration gets dropped when byte-compiling. --- lisp/use-package/use-package-core.el | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/lisp/use-package/use-package-core.el b/lisp/use-package/use-package-core.el index 0d99e270a3f..e0e16134ed3 100644 --- a/lisp/use-package/use-package-core.el +++ b/lisp/use-package/use-package-core.el @@ -1619,7 +1619,8 @@ defvar use-package--form) ;; See `use-package-handler/:ensure' for an explanation. (if (bound-and-true-p byte-compile-current-file) (funcall #'use-package-vc-install arg local-path) ; compile time - (push `(use-package-vc-install ',arg ,local-path) body)))) ; runtime + (push `(use-package-vc-install ',arg ,local-path) body)) ; runtime + body)) (defun use-package-normalize--vc-arg (arg) "Normalize possible arguments to the `:vc' keyword. -- 2.40.1 ------------=_1685777342-17137-1--