Mercurial > emacs
changeset 107216:f824258be7d1
* files.el (hack-local-variables-filter): For eval forms, also
check safe-local-variable-p (Bug#5636).
| author | Chong Yidong <cyd@stupidchicken.com> |
|---|---|
| date | Wed, 24 Feb 2010 10:30:49 -0500 |
| parents | 5b5e4a97bbce |
| children | 27eb4f088075 |
| files | lisp/ChangeLog lisp/files.el |
| diffstat | 2 files changed, 6 insertions(+), 0 deletions(-) [+] |
line wrap: on
line diff
--- a/lisp/ChangeLog Wed Feb 24 10:12:17 2010 -0500 +++ b/lisp/ChangeLog Wed Feb 24 10:30:49 2010 -0500 @@ -1,3 +1,8 @@ +2010-02-24 Chong Yidong <cyd@stupidchicken.com> + + * files.el (hack-local-variables-filter): For eval forms, also + check safe-local-variable-p (Bug#5636). + 2010-02-24 Eduard Wiebe <usenet@pusto.de> * javascript.el (wisent-javascript-jv-expand-tag): Avoid c(ad)ddr
--- a/lisp/files.el Wed Feb 24 10:12:17 2010 -0500 +++ b/lisp/files.el Wed Feb 24 10:30:49 2010 -0500 @@ -2981,6 +2981,7 @@ (push elt all-vars) (or (eq enable-local-eval t) (hack-one-local-variable-eval-safep (eval (quote val))) + (safe-local-variable-p var val) (push elt unsafe-vars)))) ;; Ignore duplicates (except `mode') in the present list. ((and (assq var all-vars) (not (eq var 'mode))) nil)