* lisp/international/mule.el (sgml-html-meta-auto-coding-function):

Add support for detecting encoding in HTML5 specified only as
<meta charset="UTF-8">.  Implementation just makes http-equiv and
content-type parts from HTML4 encoding string optional.

Fixes: debbugs:9716

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 0562f2f2fa03bb84635033338b309ad1bb6d76dc..7f03894e728f9899e87c8743f011ce0843bc9214 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,10 @@
+2011-10-18  Jirka Kosek  <jirka@kosek.cz>  (tiny change)
+
+       * international/mule.el (sgml-html-meta-auto-coding-function):
+       Add support for detecting encoding in HTML5 specified only as
+       <meta charset="UTF-8">.  Implementation just makes http-equiv and
+       content-type parts from HTML4 encoding string optional.  (Bug#9716)
+
 2011-10-18  Glenn Morris  <rgm@gnu.org>
 
        * vc/vc.el (vc-initial-comment): Mark as obsolete.  (Bug#9745)

diff --git a/lisp/international/mule.el b/lisp/international/mule.el
index 4a387a233a01f44c511855ed71086a68e0aeb4bd..cac37b3b8c5b7f3007a9fe6610297d678a426302 100644 (file)
--- a/lisp/international/mule.el
+++ b/lisp/international/mule.el
@@ -2403,8 +2403,8 @@ This function is intended to be added to `auto-coding-functions'."
     ;; (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))
+              (re-search-forward "<meta\\s-+\\(http-equiv=[\"']?content-type[\"']?\\s-+content=[\"']text/\\sw+;\\s-*\\)?charset=[\"']?\\(.+?\\)[\"'\\s-/>]" size t))
+      (let* ((match (match-string 2))
             (sym (intern (downcase match))))
        (if (coding-system-p sym)
            sym