2 files changed, 7 insertions, 3 deletions

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index eb6dba6c6c0..68cff36afac 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,7 @@
+2002-06-13  Andreas Schwab  <schwab@suse.de>
+
+        * files.el (auto-mode-alist): Move entry for ".in" to the end.
+
 2002-06-13  Miles Bader  <miles@gnu.org>
 
         * comint.el (comint-mode): Don't set `font-lock-defaults'.
diff --git a/lisp/files.el b/lisp/files.el
index bb712ba87cb..3a6ace430c9 100644
--- a/lisp/files.el
+++ b/lisp/files.el
@@ -1460,8 +1460,7 @@ in that case, this function acts as if `enable-local-variables' were t."
   (mapc
    (lambda (elt)
      (cons (purecopy (car elt)) (cdr elt)))
-   '(("\\.in\\'" nil t)
-     ("\\.te?xt\\'" . text-mode)
+   '(("\\.te?xt\\'" . text-mode)
      ("\\.c\\'" . c-mode)
      ("\\.h\\'" . c-mode)
      ("\\.tex\\'" . tex-mode)
@@ -1595,7 +1594,8 @@ in that case, this function acts as if `enable-local-variables' were t."
      ;; for the sake of ChangeLog.1, etc.
      ;; and after the .scm.[0-9] and CVS' <file>.<rev> patterns too.
      ("\\.[1-9]\\'" . nroff-mode)
-     ("\\.g\\'" . antlr-mode)))
+     ("\\.g\\'" . antlr-mode)
+     ("\\.in\\'" nil t)))
   "Alist of filename patterns vs corresponding major mode functions.
 Each element looks like (REGEXP . FUNCTION) or (REGEXP FUNCTION NON-NIL).
 \(NON-NIL stands for anything that is not nil; the value does not matter.)