[Emacs-diffs] /srv/bzr/emacs/emacs-23 r99695: (mm-add-meta-html-tag): Fix regexp matching meta tag.

[Katsumi Yamaoka]

------------------------------------------------------------
revno: 99695 [merge]
committer: Katsumi Yamaoka <address@hidden>
branch nick: emacs-23
timestamp: Mon 2010-03-29 10:18:13 +0000
message:
  (mm-add-meta-html-tag): Fix regexp matching meta tag.
modified:
  lisp/gnus/ChangeLog
  lisp/gnus/mm-decode.el

=== modified file 'lisp/gnus/ChangeLog'
--- a/lisp/gnus/ChangeLog       2010-03-27 17:53:35 +0000
+++ b/lisp/gnus/ChangeLog       2010-03-29 10:16:23 +0000
@@ -1,3 +1,7 @@
+2010-03-29  Katsumi Yamaoka  <address@hidden>
+
+       * mm-decode.el (mm-add-meta-html-tag): Fix regexp matching meta tag.
+
 2010-03-27  Chong Yidong  <address@hidden>
 
        * message.el (message-default-mail-headers):

=== modified file 'lisp/gnus/mm-decode.el'
--- a/lisp/gnus/mm-decode.el    2010-01-13 08:35:10 +0000
+++ b/lisp/gnus/mm-decode.el    2010-03-29 10:16:23 +0000
@@ -1265,7 +1265,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 (match-beginning 2)
                     (string-match "\\`html\\'" (match-string 1)))
                ;; Don't modify existing meta tag.