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

(sgml-html-meta-auto-coding-function): Ensure that the buffer contains a

Browse source 
HTML document.
This commit is contained in:
Romain Francoise 2007-01-05 17:58:02 +00:00
parent ab3aad87d9
commit 129f19896b
2 changed files with 14 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
lisp/ChangeLog
View file

@ -1,6 +1,11 @@
2007-01-05 Romain Francoise <romain@orebokech.com>
* international/mule.el (sgml-html-meta-auto-coding-function):
Ensure that the buffer contains a HTML document.
2007-01-05 Dan Nicolaescu <dann@ics.uci.edu>
* faces.el (momentary): Move here ...
* faces.el (momentary): Move here ...
* subr.el (momentary): ... from here.
2007-01-05 Nick Roberts <nickrob@snap.net.nz>
@ -11,9 +16,9 @@
2007-01-04 Juanma Barranquero <lekktu@gmail.com>
* files.el (find-file-noselect-1, set-visited-file-name):
* files.el (find-file-noselect-1, set-visited-file-name):
Allow backup-enable-predicate to be nil.
2007-01-04 Kevin Rodgers <kevin.d.rodgers@gmail.com>
* subr.el (momentary): New face.

7
lisp/international/mule.el
View file

@ -2292,7 +2292,12 @@ This function is intended to be added to `auto-coding-functions'."
;; In case of no header, search only 10 lines.
(forward-line 10))
(point))))
(when (re-search-forward "<meta\\s-+http-equiv=[\"']?content-type[\"']?\\s-+content=[\"']text/\\sw+;\\s-*charset=\\(.+?\\)[\"']" size t)
;; Make sure that the buffer really contains an HTML document, by
;; checking that it starts with a doctype or a <HTML> start tag
;; (allowing for whitespace at bob). Note: 'DOCTYPE NETSCAPE' is
;; useful for Mozilla bookmark files.
(when (and (re-search-forward "\\`[[:space:]\n]*\\(<!doctype[[:space:]\n]+\\(html\\|netscape\\)\\|<html\\)" size t)
(re-search-forward "<meta\\s-+http-equiv=[\"']?content-type[\"']?\\s-+content=[\"']text/\\sw+;\\s-*charset=\\(.+?\\)[\"']" size t))
(let* ((match (match-string 1))
(sym (intern (downcase match))))
(if (coding-system-p sym)