From: Karel Klíc <kklic@redhat.com>
Date: Sat, 11 Dec 2010 02:48:23 +0000 (-0800)
Subject: * lisp/files.el (auto-mode-alist): Use html-mode for *.xhtml.
X-Git-Tag: emacs-pretest-24.0.90~104^2~275^2~438^2~43^2~6
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=1e5d2a048d4c76ba4aa0c86f7393297b0d3cd373;p=emacs.git

* 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 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)