aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDaiki Ueno2011-10-26 09:25:34 +0000
committerKatsumi Yamaoka2011-10-26 09:25:34 +0000
commit49964155e29a676d4e6ad9a982011c11a6589a3d (patch)
tree7dca74734d0c546112a99e518c62341777bfcb57
parentad74a69e6bfe6ae72a9ae7e892730b50e9430bef (diff)
downloademacs-49964155e29a676d4e6ad9a982011c11a6589a3d.tar.gz
emacs-49964155e29a676d4e6ad9a982011c11a6589a3d.zip
mml.el: Support quoting <#secure> tag.
-rw-r--r--lisp/gnus/ChangeLog7
-rw-r--r--lisp/gnus/mml.el4
2 files changed, 8 insertions, 3 deletions
diff --git a/lisp/gnus/ChangeLog b/lisp/gnus/ChangeLog
index 592d0671c26..8b4e993149e 100644
--- a/lisp/gnus/ChangeLog
+++ b/lisp/gnus/ChangeLog
@@ -1,3 +1,8 @@
12011-10-26 Daiki Ueno <ueno@unixuser.org>
2
3 * mml.el (mml-quote-region): Quote <#secure> tag.
4 (mml-generate-mime-1): Unquote <#secure> tag.
5
12011-10-20 Chong Yidong <cyd@gnu.org> 62011-10-20 Chong Yidong <cyd@gnu.org>
2 7
3 * gnus-cite.el (gnus-message-citation-mode): Doc fix (in Emacs 24, 8 * gnus-cite.el (gnus-message-citation-mode): Doc fix (in Emacs 24,
@@ -18548,7 +18553,7 @@
18548 gnus-requst-update-info with explicit code to sync the in-memory 18553 gnus-requst-update-info with explicit code to sync the in-memory
18549 info read flags with the marks being sync'd to the backend. 18554 info read flags with the marks being sync'd to the backend.
18550 18555
18551 *gnus-util.el (gnus-pp): Add optional stream to match pp API. 18556 * gnus-util.el (gnus-pp): Add optional stream to match pp API.
18552 18557
185532004-09-28 Teodor Zlatanov <tzz@lifelogs.com> 185582004-09-28 Teodor Zlatanov <tzz@lifelogs.com>
18554 18559
diff --git a/lisp/gnus/mml.el b/lisp/gnus/mml.el
index 0d2ae2a845a..352fa329e3e 100644
--- a/lisp/gnus/mml.el
+++ b/lisp/gnus/mml.el
@@ -525,7 +525,7 @@ If MML is non-nil, return the buffer up till the correspondent mml tag."
525 ;; Remove quotes from quoted tags. 525 ;; Remove quotes from quoted tags.
526 (goto-char (point-min)) 526 (goto-char (point-min))
527 (while (re-search-forward 527 (while (re-search-forward
528 "<#!+/?\\(part\\|multipart\\|external\\|mml\\)" 528 "<#!+/?\\(part\\|multipart\\|external\\|mml\\|secure\\)"
529 nil t) 529 nil t)
530 (delete-region (+ (match-beginning 0) 2) 530 (delete-region (+ (match-beginning 0) 2)
531 (+ (match-beginning 0) 3)))))) 531 (+ (match-beginning 0) 3))))))
@@ -1232,7 +1232,7 @@ If not set, `default-directory' will be used."
1232 (goto-char (point-min)) 1232 (goto-char (point-min))
1233 ;; Quote parts. 1233 ;; Quote parts.
1234 (while (re-search-forward 1234 (while (re-search-forward
1235 "<#!*/?\\(multipart\\|part\\|external\\|mml\\)" nil t) 1235 "<#!*/?\\(multipart\\|part\\|external\\|mml\\|secure\\)" nil t)
1236 ;; Insert ! after the #. 1236 ;; Insert ! after the #.
1237 (goto-char (+ (match-beginning 0) 2)) 1237 (goto-char (+ (match-beginning 0) 2))
1238 (insert "!"))))) 1238 (insert "!")))))