* textmodes/dns-mode.el (auto-mode-alist): Add entry for .zone files.

* files.el (auto-mode-alist): Remove redundant entries.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index e2aeabf1fe12a22bf70d1d2889b22cb90c6f08bc..5723d7af009af5634b5cf1f477e214dafa67a877 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -4,6 +4,9 @@
 
 2010-05-07  Stefan Monnier  <monnier@iro.umontreal.ca>
 
+       * textmodes/dns-mode.el (auto-mode-alist): Add entry for .zone files.
+       * files.el (auto-mode-alist): Remove redundant entries.
+
        * files.el (auto-save-mode): Move to simple.el to fix bootstrap.
        * simple.el (auto-save-mode): Move from files.el.
        * minibuffer.el (completion--common-suffix): Fix copy&paste error.

diff --git a/lisp/files.el b/lisp/files.el
index 406ee7e00cbd041a1cf2a0c662e8c99d110ca187..d14599f574a423b0a70f316a28170212b3441dda 100644 (file)
--- a/lisp/files.el
+++ b/lisp/files.el
@@ -2260,7 +2260,6 @@ ARC\\|ZIP\\|LZH\\|LHA\\|ZOO\\|[JEW]AR\\|XPI\\|RAR\\|7Z\\)\\'" . archive-mode)
      ;; /tmp/Re.... or Message
      ("\\`/tmp/Re" . text-mode)
      ("/Message[0-9]*\\'" . text-mode)
-     ("\\.zone\\'" . zone-mode)
      ;; some news reader is reported to use this
      ("\\`/tmp/fol/" . text-mode)
      ("\\.oak\\'" . scheme-mode)
@@ -2294,7 +2293,6 @@ ARC\\|ZIP\\|LZH\\|LHA\\|ZOO\\|[JEW]AR\\|XPI\\|RAR\\|7Z\\)\\'" . archive-mode)
      ("#\\*mail\\*" . mail-mode)
      ("\\.g\\'" . antlr-mode)
      ("\\.ses\\'" . ses-mode)
-     ("\\.\\(soa\\|zone\\)\\'" . dns-mode)
      ("\\.docbook\\'" . sgml-mode)
      ("\\.com\\'" . dcl-mode)
      ("/config\\.\\(?:bat\\|log\\)\\'" . fundamental-mode)

diff --git a/lisp/textmodes/dns-mode.el b/lisp/textmodes/dns-mode.el
index bb9fedad206a06e236637ef2053f37cc4fb3605a..fa011687c1cc072d6b3f71ab9566ab4ed624c13d 100644 (file)
--- a/lisp/textmodes/dns-mode.el
+++ b/lisp/textmodes/dns-mode.el
@@ -151,6 +151,7 @@ Turning on DNS mode runs `dns-mode-hook'."
   (easy-menu-add dns-mode-menu dns-mode-map))
 
 ;;;###autoload (defalias 'zone-mode 'dns-mode)
+;;;###autoload (add-to-list 'auto-mode-alist (purecopy '("\\.zone\\'" . zone-mode)))
 
 ;; Tools.