[Emacs-diffs] /srv/bzr/emacs/emacs-23 r100264: * lisp/files.el (auto-mode-alist): Handle .dbk (DocBook) with xml-mode.

[Chong Yidong]

------------------------------------------------------------
revno: 100264
author: W. Martin Borgert <address@hidden>
committer: Chong Yidong <address@hidden>
branch nick: emacs-23
timestamp: Sat 2010-12-04 16:45:17 -0500
message:
  * lisp/files.el (auto-mode-alist): Handle .dbk (DocBook) with xml-mode.
  * etc/schema/schemas.xml: Handle *.dbk as DocBook.
modified:
  etc/ChangeLog
  etc/schema/schemas.xml
  lisp/ChangeLog
  lisp/files.el

=== modified file 'etc/ChangeLog'
--- a/etc/ChangeLog     2010-11-21 19:03:51 +0000
+++ b/etc/ChangeLog     2010-12-04 21:45:17 +0000
@@ -1,3 +1,7 @@
+2010-12-04  W. Martin Borgert <address@hidden>  (tiny change)
+
+       * schema/schemas.xml: Add DocBook (Bug#7491).
+
 2010-11-21  Ulrich Mueller  <address@hidden>
 
        * HELLO: Add ancient Greek (Bug#7418).

=== modified file 'etc/schema/schemas.xml'
--- a/etc/schema/schemas.xml    2010-01-13 08:35:10 +0000
+++ b/etc/schema/schemas.xml    2010-12-04 21:45:17 +0000
@@ -22,7 +22,8 @@
   <uri pattern="*.html" typeId="XHTML"/>
   <uri pattern="*.rng" typeId="RELAX NG"/>
   <uri pattern="*.rdf" typeId="RDF"/>
-  
+  <uri pattern="*.dbk" typeId="DocBook"/>
+
   <namespace ns="http://www.w3.org/1999/XSL/Transform"; typeId="XSLT"/>
   <namespace ns="http://www.w3.org/1999/02/22-rdf-syntax-ns#"; typeId="RDF"/>
   <namespace ns="http://www.w3.org/1999/xhtml"; typeId="XHTML"/>

=== modified file 'lisp/ChangeLog'
--- a/lisp/ChangeLog    2010-12-04 21:15:17 +0000
+++ b/lisp/ChangeLog    2010-12-04 21:45:17 +0000
@@ -1,3 +1,8 @@
+2010-12-04  W. Martin Borgert <address@hidden>  (tiny change)
+
+       * files.el (auto-mode-alist): Handle .dbk (DocBook) with xml-mode.
+       (Bug#7491).
+
 2010-12-04  Chong Yidong  <address@hidden>
 
        * simple.el (transient-mark-mode): Doc fix (Bug#7465).

=== modified file 'lisp/files.el'
--- a/lisp/files.el     2010-12-04 12:52:04 +0000
+++ b/lisp/files.el     2010-12-04 21:45:17 +0000
@@ -2267,6 +2267,7 @@
      ("\\.oak\\'" . scheme-mode)
      ("\\.sgml?\\'" . sgml-mode)
      ("\\.x[ms]l\\'" . xml-mode)
+     ("\\.dbk\\'" . xml-mode)
      ("\\.dtd\\'" . sgml-mode)
      ("\\.ds\\(ss\\)?l\\'" . dsssl-mode)
      ("\\.js\\'" . js-mode)            ; javascript-mode would be better