From 0448233577f904d83506626769878cd576120a6e Mon Sep 17 00:00:00 2001 From: Chong Yidong Date: Thu, 5 Jan 2012 19:12:11 +0800 Subject: 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 | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) (limited to 'lisp/ChangeLog') diff --git a/lisp/ChangeLog b/lisp/ChangeLog index d03ec37bf1..58e81f6a87 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,9 +1,16 @@ +2012-01-05 Chong Yidong + + * custom.el (enable-theme): Don't set custom-safe-themes. + + * cus-theme.el (custom-theme-merge-theme): Ignore + custom-enabled-themes and custom-safe-themes. + 2012-01-05 Michael R. Mauger * progmodes/sql.el (sql-login-hook): Add hook to respond to the first prompt in `sql-interacive-mode'. (sql-mode-oracle-font-lock-keywords): Add CONNECT_BY_* builtin - keywords. + keywords. (sql-mode-mysql-font-lock-keywords): Add ELSEIF keyword. (sql-product-interactive): Bug fix: Set `sql-buffer' in context of original buffer. Invoke `sql-login-hook'. -- cgit v1.2.3