Subject: bug#63541: [PATCH] ; Fix use-package :vc keyword when byte-compiled

From: Philip Kaludercic <[email-masked]>
Date: Thu, 18 May 2023 19:54:50 +0000

Steven Allen <[email-masked]> 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?