diff options
| -rw-r--r-- | etc/ChangeLog | 4 | ||||
| -rw-r--r-- | etc/schema/schemas.xml | 3 | ||||
| -rw-r--r-- | lisp/ChangeLog | 5 | ||||
| -rw-r--r-- | lisp/files.el | 1 |
4 files changed, 12 insertions, 1 deletions
diff --git a/etc/ChangeLog b/etc/ChangeLog index 384b276a285..738c63828fe 100644 --- a/etc/ChangeLog +++ b/etc/ChangeLog @@ -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 --git a/etc/schema/schemas.xml b/etc/schema/schemas.xml index 099df6b9436..6edc563b689 100644 --- a/etc/schema/schemas.xml +++ b/etc/schema/schemas.xml @@ -22,7 +22,8 @@ along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>. --> <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 --git a/lisp/ChangeLog b/lisp/ChangeLog index 18bf0a40391..95ee06e7812 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -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 --git a/lisp/files.el b/lisp/files.el index 97dce0fc1e5..70d514d16ec 100644 --- a/lisp/files.el +++ b/lisp/files.el @@ -2267,6 +2267,7 @@ ARC\\|ZIP\\|LZH\\|LHA\\|ZOO\\|[JEW]AR\\|XPI\\|RAR\\)\\'" . archive-mode) ("\\.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 |