* 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/ChangeLog

+2009-09-24  Chong Yidong  <cyd@stupidchicken.com>
+
+	* 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.
+
 2009-09-24  Alan Mackenzie  <acm@muc.de>
 
 	* progmodes/cc-cmds.el (c-scan-conditionals): A new function like

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

lisp/nxml/nxml-mode.el

@@ -2652,6 +2652,9 @@ With a prefix argument, inserts the character directly."
 (put 'entity-ref 'nxml-friendly-name "entity reference")
 (put 'char-ref 'nxml-friendly-name "character reference")
 
+;;;###autoload
+(defalias 'xml-mode 'nxml-mode)
+
 (provide 'nxml-mode)
 
 ;; arch-tag: 8603bc5f-1ef9-4021-b223-322fb2ca708e

lisp/textmodes/sgml-mode.el

@@ -495,11 +495,6 @@ Do \\[describe-key] on the following bindings to discover what they do.
 		    "\\)\\(" sgml-name-re "\\)\\1")
 	   2))))
 
-;; Some programs (such as Glade 2) generate XML which has
-;; -*- mode: xml -*-.
-;;;###autoload
-(defalias 'xml-mode 'sgml-mode)
-
 (defun sgml-comment-indent ()
   (if (looking-at "--") comment-column 0))