procyberian/emacs
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

* lisp/textmodes/sgml-mode.el (sgml-xml-guess): Add .xhtml extension.

Browse source
This commit is contained in:
Glenn Morris 2010-12-10 18:50:58 -08:00
parent 1e5d2a048d
commit 6961d41cfb
2 changed files with 7 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

4
lisp/ChangeLog
View file

@ -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)

4
lisp/textmodes/sgml-mode.el
View file

@ -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