diff options
| author | W. Martin Borgert <debacle@debian.org> | 2010-12-04 16:45:17 -0500 |
|---|---|---|
| committer | Chong Yidong <cyd@stupidchicken.com> | 2010-12-04 16:45:17 -0500 |
| commit | 11cb1e35ff74fdff80d74ee3ec6d61e74b802cea (patch) | |
| tree | cef8055e73054135f0af856489d3c39f5d150bb6 /lisp | |
| parent | e408289fa80874b9a4d6151bfe818b6300b9886f (diff) | |
| download | emacs-11cb1e35ff74fdff80d74ee3ec6d61e74b802cea.tar.gz emacs-11cb1e35ff74fdff80d74ee3ec6d61e74b802cea.tar.bz2 emacs-11cb1e35ff74fdff80d74ee3ec6d61e74b802cea.zip | |
* lisp/files.el (auto-mode-alist): Handle .dbk (DocBook) with xml-mode.
* etc/schema/schemas.xml: Handle *.dbk as DocBook.
Diffstat (limited to 'lisp')
| -rw-r--r-- | lisp/ChangeLog | 5 | ||||
| -rw-r--r-- | lisp/files.el | 1 |
2 files changed, 6 insertions, 0 deletions
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 |