From 1e5d2a048d4c76ba4aa0c86f7393297b0d3cd373 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Karel=20Kl=C3=ADc?= Date: Fri, 10 Dec 2010 18:48:23 -0800 Subject: [PATCH] * lisp/files.el (auto-mode-alist): Use html-mode for *.xhtml. (This really only affects empty files.) Fixes: debbugs:7606 --- lisp/ChangeLog | 4 ++++ lisp/files.el | 2 +- 2 files changed, 5 insertions(+), 1 deletion(-) 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íč + + * files.el (auto-mode-alist): Use html-mode for *.xhtml. (Bug#7606) + 2010-12-10 Stefan Monnier 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) -- 2.11.4.GIT