From b5e2141a1996ffbbaace0d7bd6b046bfbfd5041c Mon Sep 17 00:00:00 2001 From: ueno Date: Sun, 10 Feb 2008 07:14:22 +0000 Subject: [PATCH] (wl-mime-pgp-decrypt-region-with-epg): Don't use optional 3rd argument of epg-context-set-progress-callback; it was temporarily removed in the Emacs trunk due to copyright problem. (wl-mime-pgp-verify-region-with-epg): Ditto. --- wl/ChangeLog | 9 ++++++++- wl/wl-draft.el | 8 ++++---- wl/wl-mime.el | 10 ++++++---- 3 files changed, 18 insertions(+), 9 deletions(-) diff --git a/wl/ChangeLog b/wl/ChangeLog index edca779..2e59c4c 100644 --- a/wl/ChangeLog +++ b/wl/ChangeLog @@ -1,3 +1,10 @@ +2008-02-10 Daiki Ueno + + * wl-mime.el (wl-mime-pgp-decrypt-region-with-epg): Don't use + optional 3rd argument of epg-context-set-progress-callback; it was + temporarily removed in the Emacs trunk due to copyright problem. + (wl-mime-pgp-verify-region-with-epg): Ditto. + 2008-01-01 TAKAHASHI Kaoru * wl-demo.el (wl-demo-copyright-notice): Add 2008. @@ -5956,7 +5963,7 @@ message is not displayed yet. (wl-summary-prev-page): Ditto. -2002-03-11 J.ANirNtme Marant +2002-03-11 J,Ai(Br,At(Bme Marant * wl-folder.el (wl-folder-mode-menu-spec): Fixed typo. diff --git a/wl/wl-draft.el b/wl/wl-draft.el index 8121eb0..3cd7e33 100644 --- a/wl/wl-draft.el +++ b/wl/wl-draft.el @@ -539,7 +539,7 @@ or `wl-draft-reply-with-argument-list' if WITH-ARG argument is non-nil." (wl-draft-add-references) (if wl-draft-add-in-reply-to (wl-draft-add-in-reply-to))) - (wl-highlight-headers 'for-draft)) ; highlight when added References: + (wl-highlight-headers-for-draft)) ; highlight when added References: (when wl-highlight-body-too (wl-highlight-body-region beg (point-max))))) @@ -1796,7 +1796,7 @@ If KILL-WHEN-DONE is non-nil, current draft buffer is killed" (when wl-draft-write-file-function (add-hook 'local-write-file-hooks wl-draft-write-file-function)) (wl-draft-overload-functions) - (wl-highlight-headers 'for-draft) + (wl-highlight-headers-for-draft) (wl-draft-save) (clear-visited-file-modtime))) @@ -2002,7 +2002,7 @@ If KILL-WHEN-DONE is non-nil, current draft buffer is killed" (setq wl-draft-parent-folder "")) (when wl-draft-write-file-function (add-hook 'local-write-file-hooks wl-draft-write-file-function)) - (wl-highlight-headers 'for-draft) + (wl-highlight-headers-for-draft) (goto-char body-top) (run-hooks 'wl-draft-reedit-hook) (goto-char (point-max)) @@ -2607,7 +2607,7 @@ been implemented yet. Partial support for SWITCH-FUNCTION now supported." t) (setq headers (cdr headers)))) ;; highlight headers (from wl-draft in wl-draft.el) - (wl-highlight-headers 'for-draft) + (wl-highlight-headers-for-draft) ;; insert body (if (wl-string-match-assoc "body" wl-user-agent-headers-and-body-alist 'ignore-case) diff --git a/wl/wl-mime.el b/wl/wl-mime.el index d64d10f..80d8b51 100644 --- a/wl/wl-mime.el +++ b/wl/wl-mime.el @@ -513,8 +513,8 @@ It calls following-method selected from variable (elmo-with-progress-display (epg-decript nil reporter) "Decrypting" (epg-context-set-progress-callback context - #'wl-epg-progress-callback - reporter) + (cons #'wl-epg-progress-callback + reporter)) (insert (prog1 (decode-coding-string (epg-decrypt-string @@ -530,8 +530,8 @@ It calls following-method selected from variable (elmo-with-progress-display (epg-verify nil reporter) "Verifying" (epg-context-set-progress-callback context - #'wl-epg-progress-callback - reporter) + (cons #'wl-epg-progress-callback + reporter)) (epg-verify-string context (encode-coding-string @@ -865,6 +865,8 @@ With ARG, ask destination folder." (elmo-message-visible-field-list wl-message-visible-field-list) (elmo-message-sorted-field-list wl-message-sort-field-list)) (elmo-mime-insert-header entity situation) + (goto-char (point-min)) + (delete-matching-lines "^$") (wl-highlight-headers))) (defun wl-mime-decrypt-application/pgp-encrypted (entity situation) -- 1.7.10.4