* lisp/files.el (auto-mode-alist): Use html-mode for *.xhtml.

(This really only affects empty files.)

Fixes: debbugs:7606

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 9587fabcb5b806bbaecffe098c4daaec8d05f66f..a63aa192181da46754134b895a8663a6547f468f 100644 (file)
--- 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 09e2a4e072595b1f2618b933eca18ea04aa708c4..460b005b9efc6ef9857694e0acfa3ce1889199e5 100644 (file)
--- 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)