[Emacs-diffs] Changes to emacs/lisp/files.el

[Luc Teirlinck]

Index: emacs/lisp/files.el
diff -c emacs/lisp/files.el:1.766 emacs/lisp/files.el:1.767
*** emacs/lisp/files.el:1.766   Wed May 11 16:24:55 2005
--- emacs/lisp/files.el Thu May 12 23:09:33 2005
***************
*** 1728,1737 ****
  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)))
        (hack-local-variables)))
    (if (fboundp 'ucs-set-table-for-input) ; don't lose when building
        (ucs-set-table-for-input)))
--- 1728,1737 ----
  in that case, this function acts as if `enable-local-variables' were t."
    (interactive)
    (or find-file (funcall (or default-major-mode 'fundamental-mode)))
!   (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,1998 ****
  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.")
  
  (defun set-auto-mode (&optional keep-mode-if-same)
    "Select major mode appropriate for current buffer.
--- 1992,1998 ----
  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.)")
  
  (defun set-auto-mode (&optional keep-mode-if-same)
    "Select major mode appropriate for current buffer.