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

[Chong Yidong]

CVSROOT:        /sources/emacs
Module name:    emacs
Changes by:     Chong Yidong <cyd>      09/09/21 22:12:31

Modified files:
        lisp           : ChangeLog files.el 

Log message:
        * files.el (conf-mode-maybe, magic-fallback-mode-alist): Use
        nxml-mode instead of xml-mode.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/emacs/lisp/ChangeLog?cvsroot=emacs&r1=1.16225&r2=1.16226
http://cvs.savannah.gnu.org/viewcvs/emacs/lisp/files.el?cvsroot=emacs&r1=1.1082&r2=1.1083

Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/emacs/emacs/lisp/ChangeLog,v
retrieving revision 1.16225
retrieving revision 1.16226
diff -u -b -r1.16225 -r1.16226
--- ChangeLog   21 Sep 2009 09:51:38 -0000      1.16225
+++ ChangeLog   21 Sep 2009 22:12:28 -0000      1.16226
@@ -1,3 +1,8 @@
+2009-09-21  Chong Yidong  <address@hidden>
+
+       * files.el (conf-mode-maybe, magic-fallback-mode-alist): Use
+       nxml-mode instead of xml-mode.
+
 2009-09-21  Kevin Ryde  <address@hidden>
 
        * net/dig.el: Add "Keywords: comm", as per net-utils.el.  (Bug#4501)

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