Mercurial > emacs
changeset 62268:50bb635a0522
(normal-mode): Extend the scope of the `enable-local-variables'
binding to include the `set-auto-mode' call.
(magic-mode-alist): Doc fix.
| author | Luc Teirlinck <teirllm@auburn.edu> |
|---|---|
| date | Thu, 12 May 2005 23:09:33 +0000 |
| parents | 2047356fac4e |
| children | 5a9bc4bb22a5 |
| files | lisp/files.el |
| diffstat | 1 files changed, 5 insertions(+), 5 deletions(-) [+] |
line wrap: on
line diff
--- a/lisp/files.el Thu May 12 23:07:24 2005 +0000 +++ b/lisp/files.el Thu May 12 23:09:33 2005 +0000 @@ -1728,10 +1728,10 @@ in that case, this function acts as if `enable-local-variables' were t." (interactive) (or find-file (funcall (or default-major-mode 'fundamental-mode))) - (report-errors "File mode specification error: %s" - (set-auto-mode)) - (report-errors "File local-variables error: %s" - (let ((enable-local-variables (or (not find-file) enable-local-variables))) + (let ((enable-local-variables (or (not find-file) enable-local-variables))) + (report-errors "File mode specification error: %s" + (set-auto-mode)) + (report-errors "File local-variables error: %s" (hack-local-variables))) (if (fboundp 'ucs-set-table-for-input) ; don't lose when building (ucs-set-table-for-input))) @@ -1992,7 +1992,7 @@ to decide the buffer's major mode. If FUNCTION is nil, then it is not called. (That is a way of saying -\"allow `auto-mode-alist' to decide for these files.") +\"allow `auto-mode-alist' to decide for these files.)") (defun set-auto-mode (&optional keep-mode-if-same) "Select major mode appropriate for current buffer.