diff options
| author | Karel Klíc <kklic@redhat.com> | 2010-12-10 18:48:23 -0800 |
|---|---|---|
| committer | Glenn Morris <rgm@gnu.org> | 2010-12-10 18:48:23 -0800 |
| commit | 1e5d2a048d4c76ba4aa0c86f7393297b0d3cd373 (patch) | |
| tree | 12ea7bfa19227f04d6df564d9302d68560e425b9 /lisp | |
| parent | d1ddd1d02e9d341296a9874111ea684cafe96ccf (diff) | |
| download | emacs-1e5d2a048d4c76ba4aa0c86f7393297b0d3cd373.tar.gz emacs-1e5d2a048d4c76ba4aa0c86f7393297b0d3cd373.tar.bz2 emacs-1e5d2a048d4c76ba4aa0c86f7393297b0d3cd373.zip | |
* lisp/files.el (auto-mode-alist): Use html-mode for *.xhtml.
(This really only affects empty files.)
Fixes: debbugs:7606
Diffstat (limited to 'lisp')
| -rw-r--r-- | lisp/ChangeLog | 4 | ||||
| -rw-r--r-- | lisp/files.el | 2 |
2 files changed, 5 insertions, 1 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 9587fabcb5b..a63aa192181 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -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 diff --git a/lisp/files.el b/lisp/files.el index 09e2a4e0725..460b005b9ef 100644 --- a/lisp/files.el +++ b/lisp/files.el @@ -2232,7 +2232,7 @@ since only a single case-insensitive search through the alist is made." (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) |