summaryrefslogtreecommitdiff
path: root/lisp/custom.el
diff options
context:
space:
mode:
authorProtesilaos Stavrou <info@protesilaos.com>2021-03-01 17:31:44 +0200
committerBasil L. Contovounesios <contovob@tcd.ie>2021-03-01 19:50:02 +0000
commit59e1867a1f2b6938cdabac8e3f52acc9e61e9e32 (patch)
treef8f1bfa4f275b195449f93050252087a3bb834c0 /lisp/custom.el
parentece8c1307acc2b5d15babfc99cbcf2367945e95b (diff)
downloademacs-59e1867a1f2b6938cdabac8e3f52acc9e61e9e32.tar.gz
Add 'require-theme' function
* etc/NEWS: Document new function. * lisp/custom.el (require-theme): Add function. This follows from the discussion on bug#45068 where it became apparent that there was no equivalent mechanism to 'require' that read through the 'custom-theme-load-path'.
Diffstat (limited to 'lisp/custom.el')
-rw-r--r--lisp/custom.el24
1 files changed, 24 insertions, 0 deletions
diff --git a/lisp/custom.el b/lisp/custom.el
index 833810718b7..35ac4d8564a 100644
--- a/lisp/custom.el
+++ b/lisp/custom.el
@@ -1200,6 +1200,30 @@ property `theme-feature' (which is usually a symbol created by
(custom-check-theme theme)
(provide (get theme 'theme-feature)))
+(defun require-theme (theme &optional path)
+ "Load THEME stored in `custom-theme-load-path'.
+
+THEME is a symbol that corresponds to the file name without its file
+type extension. That is assumed to be either '.el' or '.elc'.
+
+When THEME is an element of `custom-available-themes', load it and ask
+for confirmation if it is not considered safe by `custom-safe-themes'.
+Otherwise load the file indicated by THEME, if present. In the latter
+case, the file is intended to work as the basis of a theme declared
+with `deftheme'.
+
+If optional PATH is non-nil, it should be a list of directories
+to search for THEME in, instead of `custom-theme-load-path'.
+PATH should have the same form as `load-path' or `exec-path'."
+ (cond
+ ((memq theme (custom-available-themes))
+ (load-theme theme))
+ ((let* ((dirs (or path (custom-theme--load-path)))
+ (file (unless (featurep theme)
+ (locate-file (symbol-name theme) dirs '(".el" ".elc")))))
+ (when file
+ (load-file file))))))
+
(defcustom custom-safe-themes '(default)
"Themes that are considered safe to load.
If the value is a list, each element should be either the SHA-256