Mercurial > emacs
changeset 111876:297fa92ba5bf
* lisp/files.el (auto-mode-alist): Use html-mode for *.xhtml.
(This really only affects empty files.)
| author | Glenn Morris <rgm@gnu.org> |
|---|---|
| date | Fri, 10 Dec 2010 18:48:23 -0800 |
| parents | 5d681b05ce9f |
| children | 8d22a439225b |
| files | lisp/ChangeLog lisp/files.el |
| diffstat | 2 files changed, 5 insertions(+), 1 deletions(-) [+] |
line wrap: on
line diff
--- a/lisp/ChangeLog Fri Dec 10 18:41:47 2010 -0800 +++ b/lisp/ChangeLog Fri Dec 10 18:48:23 2010 -0800 @@ -1,3 +1,7 @@ +2010-12-11 Karel Klíč <kklic@redhat.com> + + * files.el (auto-mode-alist): Use html-mode for *.xhtml. (Bug#7606) + 2010-12-10 Stefan Monnier <monnier@iro.umontreal.ca> Derive from prog-mode, use derived-mode-p, and fix up various
--- a/lisp/files.el Fri Dec 10 18:41:47 2010 -0800 +++ b/lisp/files.el Fri Dec 10 18:48:23 2010 -0800 @@ -2232,7 +2232,7 @@ (lambda (elt) (cons (purecopy (car elt)) (cdr elt))) `(;; do this first, so that .html.pl is Polish html, not Perl - ("\\.s?html?\\(\\.[a-zA-Z_]+\\)?\\'" . html-mode) + ("\\.[sx]?html?\\(\\.[a-zA-Z_]+\\)?\\'" . html-mode) ("\\.svgz?\\'" . image-mode) ("\\.svgz?\\'" . xml-mode) ("\\.x[bp]m\\'" . image-mode)