* lisp/custom.el (load-theme): Doc fix.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 7d8fdb27daa69cf0d3230cb023255f9c01f5e9a4..c91a900dfe105939e3602687a8e9078e7d6a8397 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,7 @@
+2012-02-22  Chong Yidong  <cyd@gnu.org>
+
+       * custom.el (load-theme): Doc fix.
+
 2012-02-22  Glenn Morris  <rgm@gnu.org>
 
        * dired-x.el (dired-guess-shell-alist-default):

diff --git a/lisp/custom.el b/lisp/custom.el
index 810b78144a4614acbc84f8ee38b6f5b2afced55c..2f17ad36da0a915be7f420e4acf31dde971acb45 100644 (file)
--- 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.

diff --git a/lisp/dired.el b/lisp/dired.el
index b683cb15b88a8d1b914d83ccea918beddbe030b4..c087f65eaebfcfcbabc57c23db40f4237cfb0bf9 100644 (file)
--- a/lisp/dired.el
+++ b/lisp/dired.el
@@ -4196,7 +4196,7 @@ instead.
 ;;;***
 \f
 ;;;### (autoloads (dired-do-relsymlink dired-jump-other-window dired-jump)
-;;;;;;  "dired-x" "dired-x.el" "bc516591d881911d72b58eeed8816576")
+;;;;;;  "dired-x" "dired-x.el" "2a39a8306a5541c304bc4ab602876f92")
 ;;; Generated autoloads from dired-x.el
 
 (autoload 'dired-jump "dired-x" "\