summaryrefslogtreecommitdiff
path: root/lisp/custom.el
diff options
context:
space:
mode:
authorChong Yidong <cyd@gnu.org>2012-02-22 14:10:03 +0800
committerChong Yidong <cyd@gnu.org>2012-02-22 14:10:03 +0800
commitabd1f678d05b172c2fc20b26a8969ef0c3310e46 (patch)
treeda956086849dd78aad240a8c162f96f22994d9bc /lisp/custom.el
parent86b847b644525b83ea218bc7b6ed2de73beaced6 (diff)
downloademacs-abd1f678d05b172c2fc20b26a8969ef0c3310e46.tar.gz
* lisp/custom.el (load-theme): Doc fix.
Diffstat (limited to 'lisp/custom.el')
-rw-r--r--lisp/custom.el7
1 files changed, 4 insertions, 3 deletions
diff --git a/lisp/custom.el b/lisp/custom.el
index 810b78144a4..2f17ad36da0 100644
--- a/lisp/custom.el
+++ b/lisp/custom.el
@@ -1138,9 +1138,10 @@ This variable cannot be set in a Custom theme."
The theme file is named THEME-theme.el, in one of the directories
specified by `custom-theme-load-path'.
-If optional arg NO-CONFIRM is non-nil, and THEME is not
-considered safe according to `custom-safe-themes', prompt the
-user for confirmation.
+If the theme is not considered safe by `custom-safe-themes',
+prompt the user for confirmation before loading it. But if
+optional arg NO-CONFIRM is non-nil, load the theme without
+prompting.
Normally, this function also enables THEME; if optional arg
NO-ENABLE is non-nil, load the theme but don't enable it.