[Emacs-diffs] /srv/bzr/emacs/trunk r102635: * lisp/textmodes/sgml-mode.el (sgml-xml-guess): Add .xhtml extension.

[Glenn Morris]

------------------------------------------------------------
revno: 102635
committer: Glenn Morris <address@hidden>
branch nick: trunk
timestamp: Fri 2010-12-10 18:50:58 -0800
message:
  * lisp/textmodes/sgml-mode.el (sgml-xml-guess): Add .xhtml extension.
modified:
  lisp/ChangeLog
  lisp/textmodes/sgml-mode.el

=== modified file 'lisp/ChangeLog'
--- a/lisp/ChangeLog    2010-12-11 02:48:23 +0000
+++ b/lisp/ChangeLog    2010-12-11 02:50:58 +0000
@@ -1,3 +1,7 @@
+2010-12-11  Glenn Morris  <address@hidden>
+
+       * textmodes/sgml-mode.el (sgml-xml-guess): Add .xhtml extension.
+
 2010-12-11  Karel Klíč  <address@hidden>
 
        * files.el (auto-mode-alist): Use html-mode for *.xhtml.  (Bug#7606)

=== modified file 'lisp/textmodes/sgml-mode.el'
--- a/lisp/textmodes/sgml-mode.el       2010-10-24 00:21:59 +0000
+++ b/lisp/textmodes/sgml-mode.el       2010-12-11 02:50:58 +0000
@@ -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