diff options
| author | Katsumi Yamaoka | 2013-09-17 10:21:24 +0000 |
|---|---|---|
| committer | Katsumi Yamaoka | 2013-09-17 10:21:24 +0000 |
| commit | 07dd2ea47f58d35b34581401a09d7d842a35fbdf (patch) | |
| tree | 5076f953133ddc8c09beaa3fda078106eb7edd23 | |
| parent | 5cf10af897aaeb89830d6ff30b17c15c44af5b61 (diff) | |
| download | emacs-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/ChangeLog | 2 | ||||
| -rw-r--r-- | lisp/gnus/mm-decode.el | 2 |
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 @@ | |||
| 1 | 2013-09-17 Katsumi Yamaoka <yamaoka@jpl.org> | 1 | 2013-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=[\"']\ |
| 1418 | text/\\(\\sw+\\)\\(?:\;\\s-*charset=\\(.+\\)\\)?[\"'][^>]*>" nil t) | 1418 | text/\\(\\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))) |