[Emacs-diffs] emacs/lisp ChangeLog files.el nxml/nxml-mode.el...

[Chong Yidong]

CVSROOT:        /sources/emacs
Module name:    emacs
Changes by:     Chong Yidong <cyd>      09/09/24 23:22:20

Modified files:
        lisp           : ChangeLog files.el 
        lisp/nxml      : nxml-mode.el 
        lisp/textmodes : sgml-mode.el 

Log message:
        * 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.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/emacs/lisp/ChangeLog?cvsroot=emacs&r1=1.16255&r2=1.16256
http://cvs.savannah.gnu.org/viewcvs/emacs/lisp/files.el?cvsroot=emacs&r1=1.1083&r2=1.1084
http://cvs.savannah.gnu.org/viewcvs/emacs/lisp/nxml/nxml-mode.el?cvsroot=emacs&r1=1.18&r2=1.19
http://cvs.savannah.gnu.org/viewcvs/emacs/lisp/textmodes/sgml-mode.el?cvsroot=emacs&r1=1.140&r2=1.141

Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/emacs/emacs/lisp/ChangeLog,v
retrieving revision 1.16255
retrieving revision 1.16256
diff -u -b -r1.16255 -r1.16256
--- ChangeLog   24 Sep 2009 20:18:56 -0000      1.16255
+++ ChangeLog   24 Sep 2009 23:22:17 -0000      1.16256
@@ -1,3 +1,13 @@
+2009-09-24  Chong Yidong  <address@hidden>
+
+       * 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  <address@hidden>
 
        * progmodes/cc-cmds.el (c-scan-conditionals): A new function like

Index: files.el
===================================================================
RCS file: /sources/emacs/emacs/lisp/files.el,v
retrieving revision 1.1083
retrieving revision 1.1084
diff -u -b -r1.1083 -r1.1084
--- files.el    21 Sep 2009 22:12:30 -0000      1.1083
+++ files.el    24 Sep 2009 23:22:20 -0000      1.1084
@@ -2249,7 +2249,7 @@
      ("\\`/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 @@
          (widen)
          (goto-char (point-min))
          (looking-at "<\\?xml \\|<!-- \\|<!DOCTYPE ")))
-      (nxml-mode)
+      (xml-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 " . nxml-mode)
+    ("<\\?xml " . xml-mode)
     (,(let* ((incomment-re "\\(?:[^-]\\|-[^-]\\)")
             (comment-re (concat "\\(?:!--" incomment-re "*-->[ \t\r\n]*<\\)")))
        (concat "[ \t\r\n]*<" comment-re "*!DOCTYPE "))

Index: nxml/nxml-mode.el
===================================================================
RCS file: /sources/emacs/emacs/lisp/nxml/nxml-mode.el,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -b -r1.18 -r1.19
--- nxml/nxml-mode.el   5 Jan 2009 03:22:51 -0000       1.18
+++ nxml/nxml-mode.el   24 Sep 2009 23:22:20 -0000      1.19
@@ -2652,6 +2652,9 @@
 (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

Index: textmodes/sgml-mode.el
===================================================================
RCS file: /sources/emacs/emacs/lisp/textmodes/sgml-mode.el,v
retrieving revision 1.140
retrieving revision 1.141
diff -u -b -r1.140 -r1.141
--- textmodes/sgml-mode.el      18 Aug 2009 01:19:31 -0000      1.140
+++ textmodes/sgml-mode.el      24 Sep 2009 23:22:20 -0000      1.141
@@ -495,11 +495,6 @@
                    "\\)\\(" 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))