Merge from emacs-23

[gnu-emacs] / lisp / textmodes / dns-mode.el

diff --git a/lisp/textmodes/dns-mode.el b/lisp/textmodes/dns-mode.el
index 9bdf54cd34fa0d76d2f212cb22ac76ffc236a8dd..fa011687c1cc072d6b3f71ab9566ab4ed624c13d 100644 (file)
--- a/lisp/textmodes/dns-mode.el
+++ b/lisp/textmodes/dns-mode.el
@@ -1,10 +1,10 @@
 ;;; dns-mode.el --- a mode for viewing/editing Domain Name System master files
 
-;; Copyright (C) 2000, 2001, 2004, 2005, 2006, 2007, 2008
+;; Copyright (C) 2000, 2001, 2004, 2005, 2006, 2007, 2008, 2009, 2010
 ;;   Free Software Foundation, Inc.
 
 ;; Author: Simon Josefsson <simon@josefsson.org>
-;; Keywords: DNS master zone file SOA
+;; Keywords: DNS master zone file SOA comm
 
 ;; This file is part of GNU Emacs.
 
@@ -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.
 
@@ -222,7 +223,7 @@ This function is run from `before-save-hook'."
           ;; We return nil in case this is used in write-contents-functions.
           nil)))
 
-;;;###autoload(add-to-list 'auto-mode-alist '("\\.soa\\'" . dns-mode))
+;;;###autoload(add-to-list 'auto-mode-alist (purecopy '("\\.soa\\'" . dns-mode)))
 
 (provide 'dns-mode)