diff options
| -rw-r--r-- | lisp/ChangeLog | 4 | ||||
| -rw-r--r-- | lisp/custom.el | 7 | ||||
| -rw-r--r-- | lisp/dired.el | 2 |
3 files changed, 9 insertions, 4 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 7d8fdb27daa..c91a900dfe1 100644 --- 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 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. diff --git a/lisp/dired.el b/lisp/dired.el index b683cb15b88..c087f65eaeb 100644 --- a/lisp/dired.el +++ b/lisp/dired.el @@ -4196,7 +4196,7 @@ instead. ;;;*** ;;;### (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" "\ |