diff options
| -rw-r--r-- | lisp/ChangeLog | 5 | ||||
| -rw-r--r-- | lisp/files.el | 2 |
2 files changed, 6 insertions, 1 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 976b8190c22..dcbe3034a53 100644 --- 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 9d6218cc4eb..b010b08d883 100644 --- 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 |