# HG changeset patch
# User Chong Yidong <cyd@stupidchicken.com>
# Date 1135445722 0
# Node ID 66142acef663b678a574b5f2dbb15decc2c98998
# Parent  a39effc015be06de017041f8f90c640a8ba1a297
	* custom.texi (Custom Themes): `load-theme' always loads.

diff -r a39effc015be -r 66142acef663 man/ChangeLog
--- a/man/ChangeLog	Sat Dec 24 17:30:08 2005 +0000
+++ b/man/ChangeLog	Sat Dec 24 17:35:22 2005 +0000
@@ -1,3 +1,7 @@
+2005-12-24  Chong Yidong  <cyd@stupidchicken.com>
+
+	* custom.texi (Custom Themes): `load-theme' always loads.
+
 2005-12-23  Juri Linkov  <juri@jurta.org>
 
 	* display.texi (Highlight Interactively): Use double space to
diff -r a39effc015be -r 66142acef663 man/custom.texi
--- a/man/custom.texi	Sat Dec 24 17:30:08 2005 +0000
+++ b/man/custom.texi	Sat Dec 24 17:35:22 2005 +0000
@@ -706,13 +706,12 @@
 @findex enable-theme
 @findex disable-theme
 You can load the themes you've previously defined with the command
-@code{load-theme}.  It prompts for a theme name in the minibuffer,
-then loads that theme if it isn't already loaded.  It also
-@dfn{enables} the theme, which means putting its settings into effect.
-An enabled theme can be @dfn{disabled} with the command
-@kbd{M-x disable-theme}; this returns the options specified in the
-theme to their original values.  To re-enable the theme, use the
-command @kbd{M-x enable-theme}.
+@code{load-theme}.  It prompts for a theme name in the minibuffer, and
+loads that theme from the theme file.  It also @dfn{enables} the
+theme, which means putting its settings into effect.  An enabled theme
+can be @dfn{disabled} with the command @kbd{M-x disable-theme}; this
+returns the options specified in the theme to their original values.
+To re-enable the theme, use the command @kbd{M-x enable-theme}.
 
 To enable a Custom theme named @var{foo} whenever Emacs is started up,
 add the line @code{(load-theme '@var{foo})} to your @file{.emacs} file