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

[Dave Love]

Index: emacs/lisp/files.el
diff -c emacs/lisp/files.el:1.669 emacs/lisp/files.el:1.670
*** emacs/lisp/files.el:1.669   Thu Oct  2 05:44:01 2003
--- emacs/lisp/files.el Mon Oct  6 12:29:50 2003
***************
*** 42,48 ****
  (defcustom delete-auto-save-files t
    "*Non-nil means delete auto-save file when a buffer is saved or killed.
  
! Note that auto-save file will not be deleted if the buffer is killed
  when it has unsaved changes."
    :type 'boolean
    :group 'auto-save)
--- 42,48 ----
  (defcustom delete-auto-save-files t
    "*Non-nil means delete auto-save file when a buffer is saved or killed.
  
! Note that the auto-save file will not be deleted if the buffer is killed
  when it has unsaved changes."
    :type 'boolean
    :group 'auto-save)
***************
*** 355,364 ****
  
  ;;;It is not useful to make this a local variable.
  ;;;(put 'find-file-hooks 'permanent-local t)
! (defvar find-file-hook nil
    "List of functions to be called after a buffer is loaded from a file.
  The buffer's local variables (if any) will have been processed before the
! functions are called.")
  (defvaralias 'find-file-hooks 'find-file-hook)
  (make-obsolete-variable 'find-file-hooks 'find-file-hook "21.4")
  
--- 355,368 ----
  
  ;;;It is not useful to make this a local variable.
  ;;;(put 'find-file-hooks 'permanent-local t)
! (defcustom find-file-hook nil
    "List of functions to be called after a buffer is loaded from a file.
  The buffer's local variables (if any) will have been processed before the
! functions are called."
!   :group 'find-file
!   :type 'hook
!   :options '(auto-insert)
!   :version "21.4")
  (defvaralias 'find-file-hooks 'find-file-hook)
  (make-obsolete-variable 'find-file-hooks 'find-file-hook "21.4")
  
***************
*** 1601,1607 ****
       ("\\.ltx\\'" . latex-mode)
       ("\\.dtx\\'" . doctex-mode)
       ("\\.el\\'" . emacs-lisp-mode)
!      ("\\.scm\\'" . scheme-mode)
       ("\\.l\\'" . lisp-mode)
       ("\\.lisp\\'" . lisp-mode)
       ("\\.f\\'" . fortran-mode)
--- 1605,1611 ----
       ("\\.ltx\\'" . latex-mode)
       ("\\.dtx\\'" . doctex-mode)
       ("\\.el\\'" . emacs-lisp-mode)
!      ("\\.scm\\|\\.stk\\|\\.ss\\|\\.sch\\'" . scheme-mode)
       ("\\.l\\'" . lisp-mode)
       ("\\.lisp\\'" . lisp-mode)
       ("\\.f\\'" . fortran-mode)
***************
*** 1717,1722 ****
--- 1721,1727 ----
       ("\\.[1-9]\\'" . nroff-mode)
       ("\\.g\\'" . antlr-mode)
       ("\\.ses\\'" . ses-mode)
+      ("\\.orig\\'" nil t)             ; from patch
       ("\\.in\\'" nil t)))
    "Alist of filename patterns vs corresponding major mode functions.
  Each element looks like (REGEXP . FUNCTION) or (REGEXP FUNCTION NON-NIL).