[Emacs-diffs] /srv/bzr/emacs/trunk r102634: * lisp/files.el (auto-mode-alist): Use html-mode for *.xhtml.

[Glenn Morris]

------------------------------------------------------------
revno: 102634
author: Karel Klíc <address@hidden>
committer: Glenn Morris <address@hidden>
branch nick: trunk
timestamp: Fri 2010-12-10 18:48:23 -0800
message:
  * lisp/files.el (auto-mode-alist): Use html-mode for *.xhtml.
  (This really only affects empty files.)
modified:
  lisp/ChangeLog
  lisp/files.el

=== modified file 'lisp/ChangeLog'
--- a/lisp/ChangeLog    2010-12-10 20:00:25 +0000
+++ b/lisp/ChangeLog    2010-12-11 02:48:23 +0000
@@ -1,3 +1,7 @@
+2010-12-11  Karel Klíč  <address@hidden>
+
+       * files.el (auto-mode-alist): Use html-mode for *.xhtml.  (Bug#7606)
+
 2010-12-10  Stefan Monnier  <address@hidden>
 
        Derive from prog-mode, use derived-mode-p, and fix up various

=== modified file 'lisp/files.el'
--- a/lisp/files.el     2010-12-10 03:47:49 +0000
+++ b/lisp/files.el     2010-12-11 02:48:23 +0000
@@ -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)