* custom.texi (Custom Themes): `load-theme' always loads.

diff --git a/man/ChangeLog b/man/ChangeLog
index e73b8f52429284a81a17f0210e2b8fbad1979e44..a5774d68c87a0b07b26c34da69bd35d4e4a78488 100644 (file)
--- a/man/ChangeLog
+++ b/man/ChangeLog
@@ -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 --git a/man/custom.texi b/man/custom.texi
index 2180fcdd04a542481342ff51cd3b5cca5088436d..c2370b031857526a361a842a28eaa112e5d3dae1 100644 (file)
--- a/man/custom.texi
+++ b/man/custom.texi
@@ -706,13 +706,12 @@ file @file{@var{foo}-theme.el}, in the directory @file{~/.emacs.d/}
 @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