summaryrefslogtreecommitdiff
path: root/lisp/custom.el
diff options
context:
space:
mode:
authorBasil L. Contovounesios <contovob@tcd.ie>2021-03-05 11:02:20 +0000
committerBasil L. Contovounesios <contovob@tcd.ie>2021-03-05 11:02:20 +0000
commit0ddbacca7d45e68a3235489de94293335891806c (patch)
tree7c46710ce979f44a7a44da00e20fc27b87468de2 /lisp/custom.el
parent77ec25122c9a7855657de564101c9fe763b91013 (diff)
downloademacs-0ddbacca7d45e68a3235489de94293335891806c.tar.gz
Don't override load-path in require-theme
* lisp/custom.el (require-theme): Open-code 'require' error, because binding load-path can prevent other libraries from loading on error, such as debug.el, which gives a misleading error. (Bug#45068)
Diffstat (limited to 'lisp/custom.el')
-rw-r--r--lisp/custom.el4
1 files changed, 2 insertions, 2 deletions
diff --git a/lisp/custom.el b/lisp/custom.el
index b9fccce5833..85e5d65ffb2 100644
--- a/lisp/custom.el
+++ b/lisp/custom.el
@@ -1223,8 +1223,8 @@ provide FEATURE, signal an error. This cannot be suppressed."
(file (locate-file (symbol-name feature) path '(".elc" ".el"))))
(and file (require feature (file-name-sans-extension file) noerror))))
((not noerror)
- (let (load-path)
- (require feature)))))
+ (signal 'file-missing `("Cannot open load file" "No such file or directory"
+ ,(symbol-name feature))))))
(defcustom custom-safe-themes '(default)
"Themes that are considered safe to load.