From: Katsumi Yamaoka <yamaoka@jpl.org>
Date: Fri, 17 Feb 2017 10:05:56 +0000 (+0000)
Subject: mm-add-meta-html-tag: Improve regexp
X-Git-Tag: emacs-26.0.90~806
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=630e2d2e6aeba60f178c6ef2b283622070b873b3;p=emacs.git

mm-add-meta-html-tag: Improve regexp

* lisp/gnus/mm-decode.el (mm-add-meta-html-tag):
Improve regexp to search html meta tag.
---

diff --git a/lisp/gnus/mm-decode.el b/lisp/gnus/mm-decode.el
index 6b539399596..6683d68a318 100644
--- a/lisp/gnus/mm-decode.el
+++ b/lisp/gnus/mm-decode.el
@@ -1413,8 +1413,8 @@ Return t if meta tag is added or replaced."
       (let ((case-fold-search t))
 	(goto-char (point-min))
 	(if (re-search-forward "\
-<meta\\s-+http-equiv=[\"']?content-type[\"']?\\s-+content=[\"']\
-text/\\(\\sw+\\)\\(?:;\\s-*charset=\\([^\"'>]+\\)\\)?[^>]*>" nil t)
+<meta\\s-+http-equiv=[\"']?content-type[\"']?\\s-+content=[\"']?\
+text/\\(\\sw+\\)\\(?:;\\s-*charset=\\([^\t\n\r \"'>]+\\)\\)?[^>]*>" nil t)
 	    (if (and (not force-charset)
 		     (match-beginning 2)
 		     (string-match "\\`html\\'" (match-string 1)))