From 296f38d9f8c6ee51ce26c79d715914c409aaa02a Mon Sep 17 00:00:00 2001 From: SpacemacsBot Date: Tue, 31 Dec 2024 11:27:05 +0000 Subject: [PATCH] [bot] "built_in_updates" Tue Dec 31 11:27:05 UTC 2024 --- core/libs/package-build.el | 12 +++++++----- core/libs/package-recipe.el | 4 ++-- 2 files changed, 9 insertions(+), 7 deletions(-) diff --git a/core/libs/package-build.el b/core/libs/package-build.el index f02f813f9ba7..927fa5794c1a 100644 --- a/core/libs/package-build.el +++ b/core/libs/package-build.el @@ -978,7 +978,7 @@ Use a sandbox if `package-build--use-sandbox' is non-nil." ;;; Generate Files (defvar package-build--extras - '((:url url) + '((:url webpage) (:commit commit) (:revdesc revdesc) (:keywords keywords) @@ -1236,10 +1236,12 @@ is the same as the value of `export_file_name'." (package-read-from-string (string-join require-lines " "))))))) (oset rcp webpage - (if (fboundp 'lm-website) - (lm-website) - (with-no-warnings - (lm-homepage)))) + (or (if (fboundp 'lm-website) + (lm-website) + (with-no-warnings + (lm-homepage))) + (and-let* ((format (oref rcp repopage-format))) + (format format (oref rcp repo))))) (oset rcp keywords (lm-keywords-list)) (oset rcp maintainers (if (fboundp 'lm-maintainers) diff --git a/core/libs/package-recipe.el b/core/libs/package-recipe.el index 028b54f94f5d..97ac2ed2ada3 100644 --- a/core/libs/package-recipe.el +++ b/core/libs/package-recipe.el @@ -122,9 +122,9 @@ "Return a list of the names of packages with available recipes." (directory-files package-build-recipes-dir nil "^[^.]")) -(defun package-recipe-read-name () +(defun package-recipe-read-name (&optional prompt) "Read the name of a package for which a recipe is available." - (completing-read "Package: " (package-recipe-recipes))) + (completing-read (or prompt "Package: ") (package-recipe-recipes))) (defun package-recipe-lookup (name) "Return a recipe object for the package named NAME.