Mercurial > emacs
changeset 22476:f4871f285a9d
(user-init-file): Default value now nil.
(local-enable-local-variables): New variable.
(set-auto-mode): Test it.
| author | Richard M. Stallman <rms@gnu.org> |
|---|---|
| date | Sat, 13 Jun 1998 06:17:13 +0000 |
| parents | 3bd923346a65 |
| children | 9bc88c123895 |
| files | lisp/files.el |
| diffstat | 1 files changed, 8 insertions(+), 3 deletions(-) [+] |
line wrap: on
line diff
--- a/lisp/files.el Sat Jun 13 06:16:32 1998 +0000 +++ b/lisp/files.el Sat Jun 13 06:17:13 1998 +0000 @@ -331,6 +331,11 @@ (sexp :tag "Query" :format "%t\n" other)) :group 'find-file) +(defvar local-enable-local-variables t + "Like `enable-local-variables' but meant for buffer-local bindings. +If a major mode sets this to nil, buffer-locally, then any local +variables list in the file will be ignored.") + (defcustom enable-local-eval 'maybe "*Control processing of the \"variable\" `eval' in a file's local variables. The value can be t, nil or something else. @@ -1327,9 +1332,8 @@ When checking `inhibit-first-line-modes-regexps', we first discard from the end of the file name anything that matches one of these regexps.") -(defvar user-init-file - "" ; set by command-line - "File name including directory of user's initialization file.") +(defvar user-init-file nil + "File name, including directory, of user's initialization file.") (defun set-auto-mode (&optional just-from-file-name) "Select major mode appropriate for current buffer. @@ -1353,6 +1357,7 @@ (goto-char (point-min)) (skip-chars-forward " \t\n") (and enable-local-variables + local-enable-local-variables ;; Don't look for -*- if this file name matches any ;; of the regexps in inhibit-first-line-modes-regexps. (let ((temp inhibit-first-line-modes-regexps)