* files.el (auto-mode-alist): Change default for XML files to nXML

mode (Bug#4169).

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 976b8190c221f0ee480d416c91e3de3174350132..dcbe3034a5391e590090e1e8abccc21989332c6b 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,8 @@
+2009-09-18  Chong Yidong  <cyd@stupidchicken.com>
+
+       * files.el (auto-mode-alist): Change default for XML files to nXML
+       mode (Bug#4169).
+
 2009-09-18  Juanma Barranquero  <lekktu@gmail.com>
 
        * server.el (server-ensure-safe-dir): Pass 'integer

diff --git a/lisp/files.el b/lisp/files.el
index 9d6218cc4ebcffa922191cb8457de61121760518..b010b08d883e57b5841770b3f63dc3b9a022f722 100644 (file)
--- a/lisp/files.el
+++ b/lisp/files.el
@@ -2249,7 +2249,7 @@ ARC\\|ZIP\\|LZH\\|LHA\\|ZOO\\|[JEW]AR\\|XPI\\|RAR\\)\\'" . archive-mode)
      ("\\`/tmp/fol/" . text-mode)
      ("\\.oak\\'" . scheme-mode)
      ("\\.sgml?\\'" . sgml-mode)
-     ("\\.x[ms]l\\'" . xml-mode)
+     ("\\.x[ms]l\\'" . nxml-mode)
      ("\\.dtd\\'" . sgml-mode)
      ("\\.ds\\(ss\\)?l\\'" . dsssl-mode)
      ("\\.js\\'" . js-mode)            ; javascript-mode would be better