mirrors/emacs
1
Fork 0
mirror of git://git.sv.gnu.org/emacs.git synced 2026-02-24 08:51:10 -08:00
Code Issues Projects Releases Wiki Activity

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

Browse source 
nxml-mode instead of xml-mode.
This commit is contained in:
Chong Yidong 2009-09-21 22:12:28 +00:00
parent 7589d38e9e
commit 91fdbd6fdc
2 changed files with 7 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

5
lisp/ChangeLog
View file

@ -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)

4
lisp/files.el
View file

@ -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 "))