[Emacs-diffs] trunk r114326: lisp/gnus/mm-decode.el (mm-add-meta-html-tag): Fix regexp matching meta tag

[Katsumi Yamaoka]

------------------------------------------------------------
revno: 114326
revision-id: address@hidden
parent: address@hidden
committer: Katsumi Yamaoka <address@hidden>
branch nick: trunk
timestamp: Tue 2013-09-17 10:21:24 +0000
message:
  lisp/gnus/mm-decode.el (mm-add-meta-html-tag): Fix regexp matching meta tag
modified:
  lisp/gnus/ChangeLog            changelog-20091113204419-o5vbwnq5f7feedwu-1433
  lisp/gnus/mm-decode.el         
mmdecode.el-20091113204419-o5vbwnq5f7feedwu-1971

=== modified file 'lisp/gnus/ChangeLog'
--- a/lisp/gnus/ChangeLog       2013-09-17 09:24:02 +0000
+++ b/lisp/gnus/ChangeLog       2013-09-17 10:21:24 +0000
@@ -1,5 +1,7 @@
 2013-09-17  Katsumi Yamaoka  <address@hidden>
 
+       * mm-decode.el (mm-add-meta-html-tag): Fix regexp matching meta tag.
+
        * message.el (message-display-completion-list): Abolish.
        (message-completion-in-region): Use display-completion-list.
 

=== modified file 'lisp/gnus/mm-decode.el'
--- a/lisp/gnus/mm-decode.el    2013-08-28 08:38:28 +0000
+++ b/lisp/gnus/mm-decode.el    2013-09-17 10:21:24 +0000
@@ -1415,7 +1415,7 @@
        (goto-char (point-min))
        (if (re-search-forward "\
 <meta\\s-+http-equiv=[\"']?content-type[\"']?\\s-+content=[\"']\
-text/\\(\\sw+\\)\\(?:\;\\s-*charset=\\(.+\\)\\)?[\"'][^>]*>" nil t)
+text/\\(\\sw+\\)\\(?:\;\\s-*charset=\\([^\"'>]+\\)\\)?" nil t)
            (if (and (not force-charset)
                     (match-beginning 2)
                     (string-match "\\`html\\'" (match-string 1)))