summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLars Ingebrigtsen <larsi@gnus.org>2020-11-01 13:14:41 +0100
committerLars Ingebrigtsen <larsi@gnus.org>2020-11-01 13:14:41 +0100
commit76d522e59ef03397e15d30bb3b4de3840c917e63 (patch)
tree1f2f367eb9e55dab29cfc6ee4cfa39d462831ff0
parenta0a60321fe8128dae8bab111a96fbe12f38e481c (diff)
downloademacs-76d522e59ef03397e15d30bb3b4de3840c917e63.tar.gz
custom-theme-set-variables more resilient against removed libraries
* lisp/custom.el (custom-theme-set-variables): Don't bug out on settings that require a library that has been removed (bug#38843).
-rw-r--r--lisp/custom.el5
1 files changed, 4 insertions, 1 deletions
diff --git a/lisp/custom.el b/lisp/custom.el
index cc445fe765b..cee4589543e 100644
--- a/lisp/custom.el
+++ b/lisp/custom.el
@@ -1010,7 +1010,10 @@ COMMENT is a comment string about SYMBOL."
set)
(when requests
(put symbol 'custom-requests requests)
- (mapc #'require requests))
+ ;; Load any libraries that the setting has specified as
+ ;; being required, but don't error out if the package has
+ ;; been removed.
+ (mapc (lambda (lib) (require lib nil t)) requests))
(setq set (or (get symbol 'custom-set) #'custom-set-default))
(put symbol 'saved-value (list value))
(put symbol 'saved-variable-comment comment)