aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAndreas Schwab2002-06-13 09:32:23 +0000
committerAndreas Schwab2002-06-13 09:32:23 +0000
commitdfd8bf47b3498b83fb7ff03ba7bf9c3860604213 (patch)
tree5fd7c20bd5f6bf97414df873a47956f119ff97c0
parentfcc6fa51533c1bfe3d0b69327c40ab59b29a1dec (diff)
downloademacs-dfd8bf47b3498b83fb7ff03ba7bf9c3860604213.tar.gz
emacs-dfd8bf47b3498b83fb7ff03ba7bf9c3860604213.zip
(auto-mode-alist): Move entry for ".in" to the end.
-rw-r--r--lisp/ChangeLog4
-rw-r--r--lisp/files.el6
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 @@
12002-06-13 Andreas Schwab <schwab@suse.de>
2
3 * files.el (auto-mode-alist): Move entry for ".in" to the end.
4
12002-06-13 Miles Bader <miles@gnu.org> 52002-06-13 Miles Bader <miles@gnu.org>
2 6
3 * comint.el (comint-mode): Don't set `font-lock-defaults'. 7 * 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."
1460 (mapc 1460 (mapc
1461 (lambda (elt) 1461 (lambda (elt)
1462 (cons (purecopy (car elt)) (cdr elt))) 1462 (cons (purecopy (car elt)) (cdr elt)))
1463 '(("\\.in\\'" nil t) 1463 '(("\\.te?xt\\'" . text-mode)
1464 ("\\.te?xt\\'" . text-mode)
1465 ("\\.c\\'" . c-mode) 1464 ("\\.c\\'" . c-mode)
1466 ("\\.h\\'" . c-mode) 1465 ("\\.h\\'" . c-mode)
1467 ("\\.tex\\'" . tex-mode) 1466 ("\\.tex\\'" . tex-mode)
@@ -1595,7 +1594,8 @@ in that case, this function acts as if `enable-local-variables' were t."
1595 ;; for the sake of ChangeLog.1, etc. 1594 ;; for the sake of ChangeLog.1, etc.
1596 ;; and after the .scm.[0-9] and CVS' <file>.<rev> patterns too. 1595 ;; and after the .scm.[0-9] and CVS' <file>.<rev> patterns too.
1597 ("\\.[1-9]\\'" . nroff-mode) 1596 ("\\.[1-9]\\'" . nroff-mode)
1598 ("\\.g\\'" . antlr-mode))) 1597 ("\\.g\\'" . antlr-mode)
1598 ("\\.in\\'" nil t)))
1599 "Alist of filename patterns vs corresponding major mode functions. 1599 "Alist of filename patterns vs corresponding major mode functions.
1600Each element looks like (REGEXP . FUNCTION) or (REGEXP FUNCTION NON-NIL). 1600Each element looks like (REGEXP . FUNCTION) or (REGEXP FUNCTION NON-NIL).
1601\(NON-NIL stands for anything that is not nil; the value does not matter.) 1601\(NON-NIL stands for anything that is not nil; the value does not matter.)