Use a single let binding when expanding consecutive :custom forms

Copyright-paperwork-exempt: yes
This commit is contained in:
Johann Klähn 2021-02-03 22:55:17 +01:00
parent e4daf0cd42
commit e3938e7b26

View file

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