From: Katsumi Yamaoka <yamaoka@jpl.org>
Date: Tue, 17 Sep 2013 10:21:24 +0000 (+0000)
Subject: lisp/gnus/mm-decode.el (mm-add-meta-html-tag): Fix regexp matching meta tag
X-Git-Tag: emacs-24.3.90~173^2^2~42^2~45^2~387^2~1583
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=07dd2ea47f58d35b34581401a09d7d842a35fbdf;p=emacs.git

lisp/gnus/mm-decode.el (mm-add-meta-html-tag): Fix regexp matching meta tag
---

diff --git a/lisp/gnus/ChangeLog b/lisp/gnus/ChangeLog
index 99c2f85ee6c..18e0e3b25b1 100644
--- a/lisp/gnus/ChangeLog
+++ b/lisp/gnus/ChangeLog
@@ -1,5 +1,7 @@
 2013-09-17  Katsumi Yamaoka  <yamaoka@jpl.org>
 
+	* 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.
 
diff --git a/lisp/gnus/mm-decode.el b/lisp/gnus/mm-decode.el
index 28d930b55f7..07e66b30e58 100644
--- a/lisp/gnus/mm-decode.el
+++ b/lisp/gnus/mm-decode.el
@@ -1415,7 +1415,7 @@ Return t if meta tag is added or replaced."
 	(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)))