Merge pull request from kljohann/custom-use-single-let

Use a single let binding when expanding consecutive :custom forms
GitHub-reference: https://github.com/jwiegley/use-package/issues/906

1 files changed, 12 insertions, 11 deletions

diff --git a/lisp/use-package/use-package-core.el b/lisp/use-package/use-package-core.el
index 9edcff0ea15..72e080001b2 100644
--- a/lisp/use-package/use-package-core.el
+++ b/lisp/use-package/use-package-core.el
@@ -1397,17 +1397,18 @@ no keyword implies `:all'."
 (defun use-package-handler/:custom (name _keyword args rest state)
   "Generate use-package custom keyword code."
   (use-package-concat
-   (mapcar
-    #'(lambda (def)
-        (let ((variable (nth 0 def))
-              (value (nth 1 def))
-              (comment (nth 2 def)))
-          (unless (and comment (stringp comment))
-            (setq comment (format "Customized with use-package %s" name)))
-          `(let ((custom--inhibit-theme-enable nil))
-             (custom-theme-set-variables 'use-package
-			                 '(,variable ,value nil () ,comment)))))
-    args)
+   `((let ((custom--inhibit-theme-enable nil))
+       (custom-theme-set-variables
+        'use-package
+        ,@(mapcar
+           #'(lambda (def)
+               (let ((variable (nth 0 def))
+                     (value (nth 1 def))
+                     (comment (nth 2 def)))
+                 (unless (and comment (stringp comment))
+                   (setq comment (format "Customized with use-package %s" name)))
+                 `'(,variable ,value nil () ,comment)))
+           args))))
    (use-package-process-keywords name rest state)))
 
 ;;;; :custom-face