Commit 91fdbd6f authored by Chong Yidong's avatar Chong Yidong
Browse files

* files.el (conf-mode-maybe, magic-fallback-mode-alist): Use

nxml-mode instead of xml-mode.
parent 7589d38e
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> 2009-09-21 Kevin Ryde <user42@zip.com.au>
* net/dig.el: Add "Keywords: comm", as per net-utils.el. (Bug#4501) * net/dig.el: Add "Keywords: comm", as per net-utils.el. (Bug#4501)
......
...@@ -2344,7 +2344,7 @@ and `magic-mode-alist', which determines modes based on file contents.") ...@@ -2344,7 +2344,7 @@ and `magic-mode-alist', which determines modes based on file contents.")
(widen) (widen)
(goto-char (point-min)) (goto-char (point-min))
(looking-at "<\\?xml \\|<!-- \\|<!DOCTYPE "))) (looking-at "<\\?xml \\|<!-- \\|<!DOCTYPE ")))
(xml-mode) (nxml-mode)
(conf-mode))) (conf-mode)))
(defvar interpreter-mode-alist (defvar interpreter-mode-alist
...@@ -2442,7 +2442,7 @@ If FUNCTION is nil, then it is not called. (That is a way of saying ...@@ -2442,7 +2442,7 @@ If FUNCTION is nil, then it is not called. (That is a way of saying
. html-mode) . html-mode)
("<!DOCTYPE[ \t\r\n]+[Hh][Tt][Mm][Ll]" . html-mode) ("<!DOCTYPE[ \t\r\n]+[Hh][Tt][Mm][Ll]" . html-mode)
;; These two must come after html, because they are more general: ;; These two must come after html, because they are more general:
("<\\?xml " . xml-mode) ("<\\?xml " . nxml-mode)
(,(let* ((incomment-re "\\(?:[^-]\\|-[^-]\\)") (,(let* ((incomment-re "\\(?:[^-]\\|-[^-]\\)")
(comment-re (concat "\\(?:!--" incomment-re "*-->[ \t\r\n]*<\\)"))) (comment-re (concat "\\(?:!--" incomment-re "*-->[ \t\r\n]*<\\)")))
(concat "[ \t\r\n]*<" comment-re "*!DOCTYPE ")) (concat "[ \t\r\n]*<" comment-re "*!DOCTYPE "))
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment