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

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index ee77808..a993127 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/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/mm-decode.el b/lisp/mm-decode.el
index 28d930b..07e66b3 100644 (file)
--- a/lisp/mm-decode.el
+++ b/lisp/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)))