# HG changeset patch
# User Glenn Morris <rgm@gnu.org>
# Date 1292035858 28800
# Node ID 8d22a439225b14e7628e614c46d92de3187ae48a
# Parent  297fa92ba5bfd9576f1b301cafbec6d59e0f0b67
* lisp/textmodes/sgml-mode.el (sgml-xml-guess): Add .xhtml extension.

diff -r 297fa92ba5bf -r 8d22a439225b lisp/ChangeLog
--- a/lisp/ChangeLog	Fri Dec 10 18:48:23 2010 -0800
+++ b/lisp/ChangeLog	Fri Dec 10 18:50:58 2010 -0800
@@ -1,3 +1,7 @@
+2010-12-11  Glenn Morris  <rgm@gnu.org>
+
+	* textmodes/sgml-mode.el (sgml-xml-guess): Add .xhtml extension.
+
 2010-12-11  Karel Klíč  <kklic@redhat.com>
 
 	* files.el (auto-mode-alist): Use html-mode for *.xhtml.  (Bug#7606)
diff -r 297fa92ba5bf -r 8d22a439225b lisp/textmodes/sgml-mode.el
--- a/lisp/textmodes/sgml-mode.el	Fri Dec 10 18:48:23 2010 -0800
+++ b/lisp/textmodes/sgml-mode.el	Fri Dec 10 18:50:58 2010 -0800
@@ -384,6 +384,9 @@
   (save-excursion
     (goto-char (point-min))
     (or (string= "xml" (file-name-extension (or buffer-file-name "")))
+        ;; Maybe the buffer-size check isn't needed, I don't know.
+        (and (zerop (buffer-size))
+             (string= "xhtml" (file-name-extension (or buffer-file-name ""))))
 	(looking-at "\\s-*<\\?xml")
 	(when (re-search-forward
 	       (eval-when-compile
@@ -2153,5 +2156,4 @@
 
 (provide 'sgml-mode)
 
-;; arch-tag: 9675da94-b7f9-4bda-ad19-73ed7b4fb401
 ;;; sgml-mode.el ends here