# HG changeset patch
# User Glenn Morris <rgm@gnu.org>
# Date 1292035703 28800
# Node ID 297fa92ba5bfd9576f1b301cafbec6d59e0f0b67
# Parent  5d681b05ce9f42710282061ba098b89aa79cae0e
* lisp/files.el (auto-mode-alist): Use html-mode for *.xhtml.
(This really only affects empty files.)

diff -r 5d681b05ce9f -r 297fa92ba5bf lisp/ChangeLog
--- 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
diff -r 5d681b05ce9f -r 297fa92ba5bf lisp/files.el
--- 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)