aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKatsumi Yamaoka2010-03-29 10:16:23 +0000
committerKatsumi Yamaoka2010-03-29 10:16:23 +0000
commita2c9fe43660e50d34f7992bf3387908522e4bd02 (patch)
tree53464fba2e18d416eea9092e0500a6d03f863314
parent2a793f7f35d279ed7304772718613e40edfa917d (diff)
downloademacs-a2c9fe43660e50d34f7992bf3387908522e4bd02.tar.gz
emacs-a2c9fe43660e50d34f7992bf3387908522e4bd02.zip
(mm-add-meta-html-tag): Fix regexp matching meta tag.
-rw-r--r--lisp/gnus/ChangeLog4
-rw-r--r--lisp/gnus/mm-decode.el2
2 files changed, 5 insertions, 1 deletions
diff --git a/lisp/gnus/ChangeLog b/lisp/gnus/ChangeLog
index 7f37775bc5d..0106e6212c5 100644
--- a/lisp/gnus/ChangeLog
+++ b/lisp/gnus/ChangeLog
@@ -1,3 +1,7 @@
12010-03-29 Katsumi Yamaoka <yamaoka@jpl.org>
2
3 * mm-decode.el (mm-add-meta-html-tag): Fix regexp matching meta tag.
4
12010-03-27 Chong Yidong <cyd@stupidchicken.com> 52010-03-27 Chong Yidong <cyd@stupidchicken.com>
2 6
3 * message.el (message-default-mail-headers): 7 * message.el (message-default-mail-headers):
diff --git a/lisp/gnus/mm-decode.el b/lisp/gnus/mm-decode.el
index a511253dddb..ac05362ec0c 100644
--- a/lisp/gnus/mm-decode.el
+++ b/lisp/gnus/mm-decode.el
@@ -1265,7 +1265,7 @@ or replaced."
1265 (goto-char (point-min)) 1265 (goto-char (point-min))
1266 (if (re-search-forward "\ 1266 (if (re-search-forward "\
1267<meta\\s-+http-equiv=[\"']?content-type[\"']?\\s-+content=[\"']\ 1267<meta\\s-+http-equiv=[\"']?content-type[\"']?\\s-+content=[\"']\
1268text/\\(\\sw+\\)\\(?:\;\\s-*charset=\\(.+?\\)\\)?[\"'][^>]*>" nil t) 1268text/\\(\\sw+\\)\\(?:\;\\s-*charset=\\(.+\\)\\)?[\"'][^>]*>" nil t)
1269 (if (and (match-beginning 2) 1269 (if (and (match-beginning 2)
1270 (string-match "\\`html\\'" (match-string 1))) 1270 (string-match "\\`html\\'" (match-string 1)))
1271 ;; Don't modify existing meta tag. 1271 ;; Don't modify existing meta tag.