Mercurial > emacs
changeset 71168:3f87fbcb6f66
(sgml-html-meta-auto-coding-function):
Remove the condition `(search-forward "<html" size t)'.
Replace `\"' with `[\"']?' in `re-search-forward'.
| author | Juri Linkov <juri@jurta.org> |
|---|---|
| date | Fri, 02 Jun 2006 18:17:02 +0000 |
| parents | d61af0a1f66d |
| children | c14501c6793b |
| files | lisp/international/mule.el |
| diffstat | 1 files changed, 7 insertions(+), 9 deletions(-) [+] |
line wrap: on
line diff
--- a/lisp/international/mule.el Fri Jun 02 17:33:54 2006 +0000 +++ b/lisp/international/mule.el Fri Jun 02 18:17:02 2006 +0000 @@ -2284,21 +2284,19 @@ "If the buffer has an HTML meta tag, use it to determine encoding. This function is intended to be added to `auto-coding-functions'." (setq size (min (+ (point) size) - ;; Only search forward 10 lines (save-excursion ;; Limit the search by the end of the HTML header. (or (search-forward "</head>" size t) ;; In case of no header, search only 10 lines. (forward-line 10)) (point)))) - (when (and (search-forward "<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) - sym - (message "Warning: unknown coding system \"%s\"" match) - nil)))) + (when (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) + sym + (message "Warning: unknown coding system \"%s\"" match) + nil)))) ;;; (provide 'mule)