Tweak handling of custom-enabled-themes and custom-safe-themes.
authorChong Yidong <cyd@gnu.org>
Thu, 5 Jan 2012 11:12:11 +0000 (19:12 +0800)
committerChong Yidong <cyd@gnu.org>
Thu, 5 Jan 2012 11:12:11 +0000 (19:12 +0800)
commit0448233577f904d83506626769878cd576120a6e
treefedb3f1d50b6d8fc426d966e7c16f904a34f6263
parentb0d7d8af0743998f6d9161b28d269e100b415861
Tweak handling of custom-enabled-themes and custom-safe-themes.

* lisp/cus-theme.el (custom-theme-merge-theme): Ignore
custom-enabled-themes and custom-safe-themes.

* lisp/custom.el (enable-theme): Don't set custom-safe-themes.
lisp/ChangeLog
lisp/cus-theme.el
lisp/custom.el