# HG changeset patch
# User Chong Yidong <cyd@stupidchicken.com>
# Date 1291499117 18000
# Node ID 4bb97b6fa4d3cac9e0f0ae947142381f1db27175
# Parent  f475600c36d92618de677c592c05dbe63b82809e
* lisp/files.el (auto-mode-alist): Handle .dbk (DocBook) with xml-mode.
* etc/schema/schemas.xml: Handle *.dbk as DocBook.

diff -r f475600c36d9 -r 4bb97b6fa4d3 etc/ChangeLog
--- a/etc/ChangeLog	Sat Dec 04 16:15:17 2010 -0500
+++ b/etc/ChangeLog	Sat Dec 04 16:45:17 2010 -0500
@@ -1,3 +1,7 @@
+2010-12-04  W. Martin Borgert <debacle@debian.org>  (tiny change)
+
+	* schema/schemas.xml: Add DocBook (Bug#7491).
+
 2010-11-21  Ulrich Mueller  <ulm@gentoo.org>
 
 	* HELLO: Add ancient Greek (Bug#7418).
diff -r f475600c36d9 -r 4bb97b6fa4d3 etc/schema/schemas.xml
--- a/etc/schema/schemas.xml	Sat Dec 04 16:15:17 2010 -0500
+++ b/etc/schema/schemas.xml	Sat Dec 04 16:45:17 2010 -0500
@@ -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"/>
diff -r f475600c36d9 -r 4bb97b6fa4d3 lisp/ChangeLog
--- a/lisp/ChangeLog	Sat Dec 04 16:15:17 2010 -0500
+++ b/lisp/ChangeLog	Sat Dec 04 16:45:17 2010 -0500
@@ -1,3 +1,8 @@
+2010-12-04  W. Martin Borgert <debacle@debian.org>  (tiny change)
+
+	* files.el (auto-mode-alist): Handle .dbk (DocBook) with xml-mode.
+	(Bug#7491).
+
 2010-12-04  Chong Yidong  <cyd@stupidchicken.com>
 
 	* simple.el (transient-mark-mode): Doc fix (Bug#7465).
diff -r f475600c36d9 -r 4bb97b6fa4d3 lisp/files.el
--- a/lisp/files.el	Sat Dec 04 16:15:17 2010 -0500
+++ b/lisp/files.el	Sat Dec 04 16:45:17 2010 -0500
@@ -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