Mercurial > emacs
changeset 105134:c0874098bd62
* files.el (conf-mode-maybe, magic-fallback-mode-alist): Use
nxml-mode instead of xml-mode.
| author | Chong Yidong <cyd@stupidchicken.com> |
|---|---|
| date | Mon, 21 Sep 2009 22:12:28 +0000 |
| parents | 4bd8c41046c4 |
| children | 708c5f10a0be |
| files | lisp/ChangeLog lisp/files.el |
| diffstat | 2 files changed, 7 insertions(+), 2 deletions(-) [+] |
line wrap: on
line diff
--- a/lisp/ChangeLog Mon Sep 21 09:51:38 2009 +0000 +++ b/lisp/ChangeLog Mon Sep 21 22:12:28 2009 +0000 @@ -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)
--- a/lisp/files.el Mon Sep 21 09:51:38 2009 +0000 +++ b/lisp/files.el Mon Sep 21 22:12:28 2009 +0000 @@ -2344,7 +2344,7 @@ (widen) (goto-char (point-min)) (looking-at "<\\?xml \\|<!-- \\|<!DOCTYPE "))) - (xml-mode) + (nxml-mode) (conf-mode))) (defvar interpreter-mode-alist @@ -2442,7 +2442,7 @@ . 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 "))