------------------------------------------------------------
revno: 107373
committer: Chong Yidong <cyd@xxxxxxx>
branch nick: trunk
timestamp: Wed 2012-02-22 14:10:03 +0800
message:
* lisp/custom.el (load-theme): Doc fix.
modified:
lisp/ChangeLog
lisp/custom.el
lisp/dired.el
=== modified file 'lisp/ChangeLog'
--- a/lisp/ChangeLog 2012-02-22 04:02:44 +0000
+++ b/lisp/ChangeLog 2012-02-22 06:10:03 +0000
@@ -1,3 +1,7 @@
+2012-02-22 Chong Yidong <cyd@xxxxxxx>
+
+ * custom.el (load-theme): Doc fix.
+
2012-02-22 Glenn Morris <rgm@xxxxxxx>

* dired-x.el (dired-guess-shell-alist-default):

=== modified file 'lisp/custom.el'
--- a/lisp/custom.el 2012-02-15 04:00:34 +0000
+++ b/lisp/custom.el 2012-02-22 06:10:03 +0000
@@ -1138,9 +1138,10 @@
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.

=== modified file 'lisp/dired.el'
--- a/lisp/dired.el 2012-02-12 09:51:03 +0000
+++ b/lisp/dired.el 2012-02-22 06:10:03 +0000
@@ -4196,7 +4196,7 @@
;;;***

;;;### (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" "\

_______________________________________________
Emacs-diffs mailing list
Emacs-diffs@xxxxxxx
https://lists.gnu.org/mailman/listinfo/emacs-diffs