mirror/emacs
1
0
Fork 0
mirror of https://git.savannah.gnu.org/git/emacs.git synced 2024-11-26 07:33:47 +00:00
Code Issues Releases Activity

Revert 2010-10-18 change; use safe-functions instead.

Browse Source 
* cus-face.el (custom-theme-set-faces): Revert 2010-10-18 change.
Don't mark as safe.

* custom.el (custom-theme-set-variables): Likewise.
(load-theme): Add custom-theme-set-faces and
custom-theme-set-variables to safe-functions while loading.
(custom-enabled-themes): Mark as risky.
This commit is contained in:
Chong Yidong 2010-10-19 15:22:40 -04:00
parent 3f12b18cb5
commit 7fd8732d2e
3 changed files with 17 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
lisp/ChangeLog
View File

@ -1,3 +1,13 @@
2010-10-19 Chong Yidong <cyd@stupidchicken.com>
* cus-face.el (custom-theme-set-faces): Revert 2010-10-18 change.
Don't mark as safe.
* custom.el (custom-theme-set-variables): Likewise.
(load-theme): Add custom-theme-set-faces and
custom-theme-set-variables to safe-functions while loading.
(custom-enabled-themes): Mark as risky.
2010-10-18 Julien Danjou <julien@danjou.info> 2010-10-18 Julien Danjou <julien@danjou.info>
* bindings.el: Remove end dashes in default mode-line-format. * bindings.el: Remove end dashes in default mode-line-format.

2
lisp/cus-face.el
View File

@ -349,8 +349,6 @@ FACE's list property `theme-face' \(using `custom-push-theme')."
(put face 'face-override-spec nil) (put face 'face-override-spec nil)
(face-spec-set face spec t)))))))) (face-spec-set face spec t))))))))
(put 'custom-theme-set-faces 'safe-function t)
;; XEmacs compability function. In XEmacs, when you reset a Custom ;; XEmacs compability function. In XEmacs, when you reset a Custom
;; Theme, you have to specify the theme to reset it to. We just apply ;; Theme, you have to specify the theme to reset it to. We just apply
;; the next theme. ;; the next theme.

9
lisp/custom.el
View File

@ -993,8 +993,6 @@ in SYMBOL's list property `theme-value' \(using `custom-push-theme')."
(and (or now (default-boundp symbol)) (and (or now (default-boundp symbol))
(put symbol 'variable-comment comment))))))) (put symbol 'variable-comment comment)))))))
(put 'custom-theme-set-variables 'safe-function t)
;;; Defining themes. ;;; Defining themes.
@ -1107,6 +1105,8 @@ property `theme-feature' (which is usually a symbol created by
(let ((custom-enabling-themes t)) (let ((custom-enabling-themes t))
(enable-theme 'user)))) (enable-theme 'user))))
(defvar safe-functions) ; From unsafep.el
(defun load-theme (theme &optional no-enable) (defun load-theme (theme &optional no-enable)
"Load a theme's settings from its file. "Load a theme's settings from its file.
Normally, this also enables the theme; use `disable-theme' to Normally, this also enables the theme; use `disable-theme' to
@ -1135,7 +1135,11 @@ the theme."
;; Instead of simply loading the theme file, read it manually. ;; Instead of simply loading the theme file, read it manually.
(with-temp-buffer (with-temp-buffer
(insert-file-contents fn) (insert-file-contents fn)
(require 'unsafep)
(let ((custom--inhibit-theme-enable no-enable) (let ((custom--inhibit-theme-enable no-enable)
(safe-functions (append '(custom-theme-set-variables
custom-theme-set-faces)
safe-functions))
form scar) form scar)
(while (setq form (let ((read-circle nil)) (while (setq form (let ((read-circle nil))
(condition-case nil (condition-case nil
@ -1234,6 +1238,7 @@ and always takes precedence over other Custom Themes."
:group 'customize :group 'customize
:type '(repeat symbol) :type '(repeat symbol)
:set-after '(custom-theme-directory custom-theme-load-path) :set-after '(custom-theme-directory custom-theme-load-path)
:risky t
:set (lambda (symbol themes) :set (lambda (symbol themes)
;; Avoid an infinite loop when custom-enabled-themes is ;; Avoid an infinite loop when custom-enabled-themes is
;; defined in a theme (e.g. `user'). Enabling the theme sets ;; defined in a theme (e.g. `user'). Enabling the theme sets