From: Jirka Kosek <jirka@kosek.cz>
Date: Tue, 18 Oct 2011 08:02:47 +0000 (+0300)
Subject: * lisp/international/mule.el (sgml-html-meta-auto-coding-function):
X-Git-Tag: emacs-pretest-24.0.91~90
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=b31a56772363013e4aed416c6b05e77c7b5a9f07;p=emacs.git

* 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 0562f2f2fa0..7f03894e728 100644
--- 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 4a387a233a0..cac37b3b8c5 100644
--- 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