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#63541: [PATCH] ; Fix use-package :vc keyword when byte-compiled Date: Sat, 20 May 2023 16:50:18 +0000 Message-ID: <87wn137xrp.fsf@posteo.net> References: <20230516231204.40043-1-steven@stebalien.com> <87a5y1za7p.fsf@posteo.net> <87wn14wdvf.fsf@hyperspace> Mime-Version: 1.0 Content-Type: text/plain Injection-Info: ciao.gmane.io; posting-host="blaine.gmane.org:116.202.254.214"; logging-data="11251"; mail-complaints-to="usenet@ciao.gmane.io" Cc: 63541@debbugs.gnu.org, Steven Allen To: Tony Zorman Original-X-From: bug-gnu-emacs-bounces+geb-bug-gnu-emacs=m.gmane-mx.org@gnu.org Sat May 20 18:51:23 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 1q0Pne-0002gJ-Tc for geb-bug-gnu-emacs@m.gmane-mx.org; Sat, 20 May 2023 18:51:22 +0200 Original-Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1q0PnP-0002Ar-Er; Sat, 20 May 2023 12:51:07 -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 1q0PnL-00026m-HU for bug-gnu-emacs@gnu.org; Sat, 20 May 2023 12:51:04 -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 1q0PnK-0007e0-Ea for bug-gnu-emacs@gnu.org; Sat, 20 May 2023 12:51:03 -0400 Original-Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1q0PnK-0006uc-A7 for bug-gnu-emacs@gnu.org; Sat, 20 May 2023 12:51:02 -0400 X-Loop: help-debbugs@gnu.org 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 Original-Received: via spool by 63541-submit@debbugs.gnu.org id=B63541.168460142826423 (code B ref 63541); Sat, 20 May 2023 16:51:02 +0000 Original-Received: (at 63541) by debbugs.gnu.org; 20 May 2023 16:50:28 +0000 Original-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 Original-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 Original-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== Original-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) In-Reply-To: <87wn14wdvf.fsf@hyperspace> (Tony Zorman's message of "Fri, 19 May 2023 17:16:20 +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:262062 Archived-At: 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 :/