diff options
| author | Romain Francoise | 2007-11-02 11:02:13 +0000 |
|---|---|---|
| committer | Romain Francoise | 2007-11-02 11:02:13 +0000 |
| commit | d7a2fd422e9aa62460fe9479203f7c212af36bc6 (patch) | |
| tree | faf6512be801eb1b12b7fcd44ecad4941f7d9152 | |
| parent | 6da047e7418803afa986aa01f34abda32cfd40cc (diff) | |
| download | emacs-d7a2fd422e9aa62460fe9479203f7c212af36bc6.tar.gz emacs-d7a2fd422e9aa62460fe9479203f7c212af36bc6.zip | |
2007-11-02 Drake Wilson <drake@begriffli.ch> (tiny change)
* files.el (hack-local-variables): Fix membership tests to avoid
treating all variables as safe if `enable-local-variables' is
set to :safe.
| -rw-r--r-- | lisp/ChangeLog | 6 | ||||
| -rw-r--r-- | lisp/files.el | 4 |
2 files changed, 8 insertions, 2 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 00448b64715..dd5ab69e37c 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog | |||
| @@ -1,3 +1,9 @@ | |||
| 1 | 2007-11-02 Drake Wilson <drake@begriffli.ch> (tiny change) | ||
| 2 | |||
| 3 | * files.el (hack-local-variables): Fix membership tests to avoid | ||
| 4 | treating all variables as safe if `enable-local-variables' is | ||
| 5 | set to :safe. | ||
| 6 | |||
| 1 | 2007-11-02 Glenn Morris <rgm@gnu.org> | 7 | 2007-11-02 Glenn Morris <rgm@gnu.org> |
| 2 | 8 | ||
| 3 | * progmodes/etags.el (tags-table-mode): Disable undo. | 9 | * progmodes/etags.el (tags-table-mode): Disable undo. |
diff --git a/lisp/files.el b/lisp/files.el index 9ae4396946b..169912b94bc 100644 --- a/lisp/files.el +++ b/lisp/files.el | |||
| @@ -2764,8 +2764,8 @@ is specified, returning t if it is specified." | |||
| 2764 | ;; If caller wants only the safe variables, | 2764 | ;; If caller wants only the safe variables, |
| 2765 | ;; install only them. | 2765 | ;; install only them. |
| 2766 | (dolist (elt result) | 2766 | (dolist (elt result) |
| 2767 | (unless (or (memq (car elt) unsafe-vars) | 2767 | (unless (or (member elt unsafe-vars) |
| 2768 | (memq (car elt) risky-vars)) | 2768 | (member elt risky-vars)) |
| 2769 | (hack-one-local-variable (car elt) (cdr elt)))) | 2769 | (hack-one-local-variable (car elt) (cdr elt)))) |
| 2770 | ;; Query, except in the case where all are known safe | 2770 | ;; Query, except in the case where all are known safe |
| 2771 | ;; if the user wants no quuery in that case. | 2771 | ;; if the user wants no quuery in that case. |