2 files changed, 7 insertions, 2 deletions

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 6d61d838467..56328bbad57 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,8 @@
+2009-09-21  Chong Yidong  <cyd@stupidchicken.com>
+
+        * files.el (conf-mode-maybe, magic-fallback-mode-alist): Use
+        nxml-mode instead of xml-mode.
+
 2009-09-21  Kevin Ryde  <user42@zip.com.au>
 
         * net/dig.el: Add "Keywords: comm", as per net-utils.el.  (Bug#4501)
diff --git a/lisp/files.el b/lisp/files.el
index b010b08d883..13f907cd411 100644
--- a/lisp/files.el
+++ b/lisp/files.el
@@ -2344,7 +2344,7 @@ and `magic-mode-alist', which determines modes based on file contents.")
           (widen)
           (goto-char (point-min))
           (looking-at "<\\?xml \\|<!-- \\|<!DOCTYPE ")))
-      (xml-mode)
+      (nxml-mode)
     (conf-mode)))
 
 (defvar interpreter-mode-alist
@@ -2442,7 +2442,7 @@ If FUNCTION is nil, then it is not called.  (That is a way of saying
      . html-mode)
     ("<!DOCTYPE[ \t\r\n]+[Hh][Tt][Mm][Ll]" . html-mode)
     ;; These two must come after html, because they are more general:
-    ("<\\?xml " . xml-mode)
+    ("<\\?xml " . nxml-mode)
     (,(let* ((incomment-re "\\(?:[^-]\\|-[^-]\\)")
              (comment-re (concat "\\(?:!--" incomment-re "*-->[ \t\r\n]*<\\)")))
         (concat "[ \t\r\n]*<" comment-re "*!DOCTYPE "))