aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKatsumi Yamaoka2013-09-17 10:21:24 +0000
committerKatsumi Yamaoka2013-09-17 10:21:24 +0000
commit07dd2ea47f58d35b34581401a09d7d842a35fbdf (patch)
tree5076f953133ddc8c09beaa3fda078106eb7edd23
parent5cf10af897aaeb89830d6ff30b17c15c44af5b61 (diff)
downloademacs-07dd2ea47f58d35b34581401a09d7d842a35fbdf.tar.gz
emacs-07dd2ea47f58d35b34581401a09d7d842a35fbdf.zip
lisp/gnus/mm-decode.el (mm-add-meta-html-tag): Fix regexp matching meta tag
-rw-r--r--lisp/gnus/ChangeLog2
-rw-r--r--lisp/gnus/mm-decode.el2
2 files changed, 3 insertions, 1 deletions
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 @@
12013-09-17 Katsumi Yamaoka <yamaoka@jpl.org> 12013-09-17 Katsumi Yamaoka <yamaoka@jpl.org>
2 2
3 * mm-decode.el (mm-add-meta-html-tag): Fix regexp matching meta tag.
4
3 * message.el (message-display-completion-list): Abolish. 5 * message.el (message-display-completion-list): Abolish.
4 (message-completion-in-region): Use display-completion-list. 6 (message-completion-in-region): Use display-completion-list.
5 7
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."
1415 (goto-char (point-min)) 1415 (goto-char (point-min))
1416 (if (re-search-forward "\ 1416 (if (re-search-forward "\
1417<meta\\s-+http-equiv=[\"']?content-type[\"']?\\s-+content=[\"']\ 1417<meta\\s-+http-equiv=[\"']?content-type[\"']?\\s-+content=[\"']\
1418text/\\(\\sw+\\)\\(?:\;\\s-*charset=\\(.+\\)\\)?[\"'][^>]*>" nil t) 1418text/\\(\\sw+\\)\\(?:\;\\s-*charset=\\([^\"'>]+\\)\\)?" nil t)
1419 (if (and (not force-charset) 1419 (if (and (not force-charset)
1420 (match-beginning 2) 1420 (match-beginning 2)
1421 (string-match "\\`html\\'" (match-string 1))) 1421 (string-match "\\`html\\'" (match-string 1)))