diff options
| author | Chong Yidong <cyd@stupidchicken.com> | 2010-02-24 10:30:49 -0500 |
|---|---|---|
| committer | Chong Yidong <cyd@stupidchicken.com> | 2010-02-24 10:30:49 -0500 |
| commit | f95a5fd02f33b3002d98745396efa4097c616300 (patch) | |
| tree | 9fca50c293aba6f667016f57b182c3744676df7f | |
| parent | 6583ba0ea52f2def6484d562e4d3de88a059d0a3 (diff) | |
| download | emacs-f95a5fd02f33b3002d98745396efa4097c616300.tar.gz | |
* files.el (hack-local-variables-filter): For eval forms, also
check safe-local-variable-p (Bug#5636).
| -rw-r--r-- | lisp/ChangeLog | 5 | ||||
| -rw-r--r-- | lisp/files.el | 1 |
2 files changed, 6 insertions, 0 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 3e8e19f7cc4..d0cdaf25a23 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -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 diff --git a/lisp/files.el b/lisp/files.el index ee03c115cf8..d6783f82fbb 100644 --- a/lisp/files.el +++ b/lisp/files.el @@ -2981,6 +2981,7 @@ DIR-NAME is a directory name if these settings come from (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) |