diff options
| author | Chong Yidong | 2009-07-20 14:21:27 +0000 |
|---|---|---|
| committer | Chong Yidong | 2009-07-20 14:21:27 +0000 |
| commit | 42e0a72551dbe075ed0a1bd59098f2191926b59e (patch) | |
| tree | fefdf84e7721922721c82ba2cd4d043b6b2935f9 | |
| parent | 4ce54f6bab61f68253bbc0f37419c603992ec10d (diff) | |
| download | emacs-42e0a72551dbe075ed0a1bd59098f2191926b59e.tar.gz emacs-42e0a72551dbe075ed0a1bd59098f2191926b59e.zip | |
* files.el (hack-local-variables-filter): Fix last change.
| -rw-r--r-- | lisp/ChangeLog | 4 | ||||
| -rw-r--r-- | lisp/files.el | 2 |
2 files changed, 5 insertions, 1 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 042217c637e..2e7ad522a56 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog | |||
| @@ -1,3 +1,7 @@ | |||
| 1 | 2009-07-20 Chong Yidong <cyd@stupidchicken.com> | ||
| 2 | |||
| 3 | * files.el (hack-local-variables-filter): Fix last change. | ||
| 4 | |||
| 1 | 2009-07-19 Juri Linkov <juri@jurta.org> | 5 | 2009-07-19 Juri Linkov <juri@jurta.org> |
| 2 | 6 | ||
| 3 | * files.el (ignored-local-variables): Add `dir-local-variables-alist'. | 7 | * files.el (ignored-local-variables): Add `dir-local-variables-alist'. |
diff --git a/lisp/files.el b/lisp/files.el index ea74261601e..d12c770f5a5 100644 --- a/lisp/files.el +++ b/lisp/files.el | |||
| @@ -2973,7 +2973,7 @@ DIR-NAME is a directory name if these settings come from | |||
| 2973 | (or (and (eq enable-local-variables t) | 2973 | (or (and (eq enable-local-variables t) |
| 2974 | (null unsafe-vars) | 2974 | (null unsafe-vars) |
| 2975 | (null risky-vars)) | 2975 | (null risky-vars)) |
| 2976 | (eq enable-local-variables :all) | 2976 | (memq enable-local-variables '(:all :safe)) |
| 2977 | (hack-local-variables-confirm all-vars unsafe-vars | 2977 | (hack-local-variables-confirm all-vars unsafe-vars |
| 2978 | risky-vars dir-name)) | 2978 | risky-vars dir-name)) |
| 2979 | (dolist (elt all-vars) | 2979 | (dolist (elt all-vars) |