From: Martin Stjernholm <mast@lysator.liu.se>
Date: Sat, 5 Jul 2003 20:02:18 +0000 (+0000)
Subject: (auto-mode-alist, interpreter-mode-alist): Removed entries to CC Mode
X-Git-Tag: ttn-vms-21-2-B4~9488
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=3aae776cfef33437b3d42a317d3893059906d8ea;p=emacs.git

(auto-mode-alist, interpreter-mode-alist): Removed entries to CC Mode
modes to avoid duplicates; they are now added with autoload directives
in cc-mode.el.
---

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index e52d564a1f3..e031e8372cb 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,9 @@
+2003-07-05  Martin Stjernholm  <bug-cc-mode@gnu.org>
+
+	* files.el (auto-mode-alist, interpreter-mode-alist): Removed
+	entries to CC Mode modes to avoid duplicates; they are now added
+	with autoload directives in cc-mode.el.
+
 2003-07-05  Martin Stjernholm  <bug-cc-mode@gnu.org>
 
 	* progmodes/cc-langs.el, progmodes/cc-styles.el (c-style-alist,
diff --git a/lisp/files.el b/lisp/files.el
index bff3e1c65de..74e233783e2 100644
--- a/lisp/files.el
+++ b/lisp/files.el
@@ -1592,8 +1592,6 @@ in that case, this function acts as if `enable-local-variables' were t."
    (lambda (elt)
      (cons (purecopy (car elt)) (cdr elt)))
    '(("\\.te?xt\\'" . text-mode)
-     ("\\.c\\'" . c-mode)
-     ("\\.h\\'" . c-mode)
      ("\\.tex\\'" . tex-mode)
      ("\\.ins\\'" . tex-mode)		;Installation files for TeX packages.
      ("\\.ltx\\'" . latex-mode)
@@ -1611,18 +1609,6 @@ in that case, this function acts as if `enable-local-variables' were t."
      ("\\.ad[bs].dg\\'" . ada-mode)
      ("\\.\\([pP]\\([Llm]\\|erl\\)\\|al\\)\\'" . perl-mode)
      ("\\.s?html?\\'" . html-mode)
-     ("\\.cc\\'" . c++-mode)
-     ("\\.hh\\'" . c++-mode)
-     ("\\.hpp\\'" . c++-mode)
-     ("\\.C\\'" . c++-mode)
-     ("\\.H\\'" . c++-mode)
-     ("\\.cpp\\'" . c++-mode)
-     ("\\.cxx\\'" . c++-mode)
-     ("\\.hxx\\'" . c++-mode)
-     ("\\.c\\+\\+\\'" . c++-mode)
-     ("\\.h\\+\\+\\'" . c++-mode)
-     ("\\.m\\'" . objc-mode)
-     ("\\.java\\'" . java-mode)
      ("\\.mk\\'" . makefile-mode)
      ("\\(M\\|m\\|GNUm\\)akefile\\'" . makefile-mode)
      ("\\.am\\'" . makefile-mode)	;For Automake.
@@ -1652,7 +1638,6 @@ in that case, this function acts as if `enable-local-variables' were t."
      ("\\.me\\'" . nroff-mode)
      ("\\.ms\\'" . nroff-mode)
      ("\\.man\\'" . nroff-mode)
-     ("\\.\\(u?lpc\\|pike\\|pmod\\)\\'" . pike-mode)
      ("\\.TeX\\'" . tex-mode)
      ("\\.sty\\'" . latex-mode)
      ("\\.cls\\'" . latex-mode)		;LaTeX 2e class
@@ -1679,7 +1664,6 @@ in that case, this function acts as if `enable-local-variables' were t."
      ("\\.indent\\.pro\\'" . fundamental-mode) ; to avoid idlwave-mode
      ("\\.pro\\'" . idlwave-mode)
      ("\\.lsp\\'" . lisp-mode)
-     ("\\.awk\\'" . awk-mode)
      ("\\.prolog\\'" . prolog-mode)
      ("\\.tar\\'" . tar-mode)
      ("\\.\\(arc\\|zip\\|lzh\\|zoo\\|ear\\|jar\\|war\\)\\'" . archive-mode)
@@ -1693,15 +1677,12 @@ in that case, this function acts as if `enable-local-variables' were t."
      ("\\.zone\\'" . zone-mode)
      ;; some news reader is reported to use this
      ("\\`/tmp/fol/" . text-mode)
-     ("\\.y\\'" . c-mode)
-     ("\\.lex\\'" . c-mode)
      ("\\.oak\\'" . scheme-mode)
      ("\\.sgml?\\'" . sgml-mode)
      ("\\.xml\\'" . sgml-mode)
      ("\\.xsl\\'" . sgml-mode)
      ("\\.dtd\\'" . sgml-mode)
      ("\\.ds\\(ss\\)?l\\'" . dsssl-mode)
-     ("\\.idl\\'" . idl-mode)
      ;; .emacs or .gnus or .viper following a directory delimiter in
      ;; Unix, MSDOG or VMS syntax.
      ("[]>:/\\]\\..*\\(emacs\\|gnus\\|viper\\)\\'" . emacs-lisp-mode)
@@ -1755,10 +1736,6 @@ REGEXP and search the list again for another match.")
      ("wishx" . tcl-mode)
      ("tcl" . tcl-mode)
      ("tclsh" . tcl-mode)
-     ("awk" . awk-mode)
-     ("mawk" . awk-mode)
-     ("nawk" . awk-mode)
-     ("gawk" . awk-mode)
      ("scm" . scheme-mode)
      ("ash" . sh-mode)
      ("bash" . sh-mode)