Mercurial > emacs
diff lisp/files.el @ 91085:880960b70474
Merge from emacs--devo--0
Revision: emacs@sv.gnu.org/emacs--unicode--0--patch-283
| author | Miles Bader <miles@gnu.org> |
|---|---|
| date | Sun, 11 Nov 2007 00:56:44 +0000 |
| parents | 4bc33ffdda1a 77608327b2c8 |
| children | 53108e6cea98 |
line wrap: on
line diff
--- a/lisp/files.el Fri Nov 09 14:52:32 2007 +0000 +++ b/lisp/files.el Sun Nov 11 00:56:44 2007 +0000 @@ -450,7 +450,7 @@ (defcustom enable-local-variables t "Control use of local variables in files you visit. -The value can be t, nil, :safe, or something else. +The value can be t, nil, :safe, :all, or something else. A value of t means file local variables specifications are obeyed if all the specified variable values are safe; if any values are @@ -1964,6 +1964,7 @@ ("\\.ins\\'" . tex-mode) ;Installation files for TeX packages. ("\\.ltx\\'" . latex-mode) ("\\.dtx\\'" . doctex-mode) + ("\\.org\\'" . org-mode) ("\\.el\\'" . emacs-lisp-mode) ("\\.\\(scm\\|stk\\|ss\\|sch\\)\\'" . scheme-mode) ("\\.l\\'" . lisp-mode) @@ -2821,8 +2822,8 @@ ;; If caller wants only the safe variables, ;; install only them. (dolist (elt result) - (unless (or (memq (car elt) unsafe-vars) - (memq (car elt) risky-vars)) + (unless (or (member elt unsafe-vars) + (member elt risky-vars)) (hack-one-local-variable (car elt) (cdr elt)))) ;; Query, except in the case where all are known safe ;; if the user wants no quuery in that case.