diff options
| -rw-r--r-- | lisp/ChangeLog | 4 | ||||
| -rw-r--r-- | lisp/textmodes/sgml-mode.el | 4 |
2 files changed, 7 insertions, 1 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog index a63aa192181..130bc61f642 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -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 --git a/lisp/textmodes/sgml-mode.el b/lisp/textmodes/sgml-mode.el index 47d2f7a45e0..a525c1a7e2c 100644 --- a/lisp/textmodes/sgml-mode.el +++ b/lisp/textmodes/sgml-mode.el @@ -384,6 +384,9 @@ a DOCTYPE or an XML declaration." (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 @@ Can be used as a value for `html-mode-hook'." (provide 'sgml-mode) -;; arch-tag: 9675da94-b7f9-4bda-ad19-73ed7b4fb401 ;;; sgml-mode.el ends here |