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: Thu, 18 May 2023 19:54:50 +0000 Message-ID: <87a5y1za7p.fsf@posteo.net> References: <20230516231204.40043-1-steven@stebalien.com> Mime-Version: 1.0 Content-Type: text/plain Injection-Info: ciao.gmane.io; posting-host="blaine.gmane.org:116.202.254.214"; logging-data="17928"; 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 Thu May 18 21:55:28 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 1pzjih-0004Pc-6x for geb-bug-gnu-emacs@m.gmane-mx.org; Thu, 18 May 2023 21:55:27 +0200 Original-Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1pzjiL-0004WV-VG; Thu, 18 May 2023 15:55:05 -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 1pzjiJ-0004W4-FV for bug-gnu-emacs@gnu.org; Thu, 18 May 2023 15:55:03 -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 1pzjiI-0003P7-At for bug-gnu-emacs@gnu.org; Thu, 18 May 2023 15:55:03 -0400 Original-Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1pzjiI-0005Gc-4F for bug-gnu-emacs@gnu.org; Thu, 18 May 2023 15:55: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: 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 Original-Received: via spool by 63541-submit@debbugs.gnu.org id=B63541.168443969920222 (code B ref 63541); Thu, 18 May 2023 19:55:02 +0000 Original-Received: (at 63541) by debbugs.gnu.org; 18 May 2023 19:54:59 +0000 Original-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 Original-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 Original-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== Original-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) In-Reply-To: <20230516231204.40043-1-steven@stebalien.com> (Steven Allen's message of "Tue, 16 May 2023 16:12:04 -0700") 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:261958 Archived-At: 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?