[Emacs-diffs] /srv/bzr/emacs/trunk r106116: * lisp/international/mule.el (sgml-html-meta-auto-coding-function):

[Juri Linkov]

------------------------------------------------------------
revno: 106116
fixes bug(s): http://debbugs.gnu.org/9716
author: Jirka Kosek <address@hidden>
committer: Juri Linkov <address@hidden>
branch nick: trunk
timestamp: Tue 2011-10-18 11:02:47 +0300
message:
  * 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.
modified:
  lisp/ChangeLog
  lisp/international/mule.el

=== modified file 'lisp/ChangeLog'
--- a/lisp/ChangeLog    2011-10-18 06:52:32 +0000
+++ b/lisp/ChangeLog    2011-10-18 08:02:47 +0000
@@ -1,3 +1,10 @@
+2011-10-18  Jirka Kosek  <address@hidden>  (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  <address@hidden>
 
        * vc/vc.el (vc-initial-comment): Mark as obsolete.  (Bug#9745)

=== modified file 'lisp/international/mule.el'
--- a/lisp/international/mule.el        2011-02-01 21:37:12 +0000
+++ b/lisp/international/mule.el        2011-10-18 08:02:47 +0000
@@ -2403,8 +2403,8 @@
     ;; (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