From e477ca8496f8170d1857ed92b51c27aa5ad22b95 Mon Sep 17 00:00:00 2001
From: Chong Yidong <cyd@stupidchicken.com>
Date: Thu, 24 Sep 2009 23:22:17 +0000
Subject: * nxml/nxml-mode.el: Alias xml-mode to nxml-mode.
* textmodes/sgml-mode.el: Remove xml-mode alias.
* files.el (auto-mode-alist, conf-mode-maybe)
(magic-fallback-mode-alist): Revert 2009-09-18 and 2009-09-21
changes.
---
lisp/files.el | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
(limited to 'lisp/files.el')
diff --git a/lisp/files.el b/lisp/files.el
index 13f907cd411..9d6218cc4eb 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\\'" . nxml-mode)
+ ("\\.x[ms]l\\'" . xml-mode)
("\\.dtd\\'" . sgml-mode)
("\\.ds\\(ss\\)?l\\'" . dsssl-mode)
("\\.js\\'" . js-mode) ; javascript-mode would be better
@@ -2344,7 +2344,7 @@ and `magic-mode-alist', which determines modes based on file contents.")
(widen)
(goto-char (point-min))
(looking-at "<\\?xml \\|<!-- \\|<!DOCTYPE ")))
- (nxml-mode)
+ (xml-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 " . nxml-mode)
+ ("<\\?xml " . xml-mode)
(,(let* ((incomment-re "\\(?:[^-]\\|-[^-]\\)")
(comment-re (concat "\\(?:!--" incomment-re "*-->[ \t\r\n]*<\\)")))
(concat "[ \t\r\n]*<" comment-re "*!DOCTYPE "))
--
cgit v1.2.1