From f5a74d50eea63c1c9b15e5ba447271824e9a03ff Mon Sep 17 00:00:00 2001 From: yamaoka Date: Fri, 29 Jun 2001 04:47:08 +0000 Subject: [PATCH] Synch with Oort Gnus. --- lisp/ChangeLog | 9 ++++++++- lisp/mml2015.el | 17 +++++++++++------ 2 files changed, 19 insertions(+), 7 deletions(-) diff --git a/lisp/ChangeLog b/lisp/ChangeLog index baedd82..e4eef78 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,6 +1,13 @@ +2001-06-28 11:00:00 ShengHuo ZHU + + * mml2015.el (mml2015-format-error): New function. + (mml2015-mailcrypt-decrypt, mml2015-mailcrypt-clear-decrypt) + (mml2015-mailcrypt-verify, mml2015-gpg-clear-verify) + (mml2015-mailcrypt-clear-verify, mml2015-gpg-verify): Use it. + 2001-06-26 22:00:00 ShengHuo ZHU - * nnrss.el (nnrss-retrieve-headers): The description may exist. + * nnrss.el (nnrss-retrieve-headers): The description may not exist. Suggested by Christoph Conrad . * gnus-sum.el (gnus-summary-set-local-parameters): Don't override diff --git a/lisp/mml2015.el b/lisp/mml2015.el index 63b6356..3048c9a 100644 --- a/lisp/mml2015.el +++ b/lisp/mml2015.el @@ -77,6 +77,11 @@ (defvar mml2015-decrypt-function 'mailcrypt-decrypt) (defvar mml2015-verify-function 'mailcrypt-verify) +(defun mml2015-format-error (err) + (if (stringp (cadr err)) + (cadr err) + (format "%S" (cdr err)))) + (defun mml2015-mailcrypt-decrypt (handle ctl) (catch 'error (let (child handles result) @@ -93,7 +98,7 @@ (funcall mml2015-decrypt-function) (error (mm-set-handle-multipart-parameter - mm-security-handle 'gnus-details (cadr err)) + mm-security-handle 'gnus-details (mml2015-format-error err)) nil) (quit (mm-set-handle-multipart-parameter @@ -118,7 +123,7 @@ (funcall mml2015-decrypt-function) (error (mm-set-handle-multipart-parameter - mm-security-handle 'gnus-details (cadr err)) + mm-security-handle 'gnus-details (mml2015-format-error err)) nil) (quit (mm-set-handle-multipart-parameter @@ -194,7 +199,7 @@ (kill-buffer mc-gpg-debug-buffer))) (error (mm-set-handle-multipart-parameter - mm-security-handle 'gnus-details (cadr err)) + mm-security-handle 'gnus-details (mml2015-format-error err)) nil) (quit (mm-set-handle-multipart-parameter @@ -227,7 +232,7 @@ (kill-buffer mc-gpg-debug-buffer))) (error (mm-set-handle-multipart-parameter - mm-security-handle 'gnus-details (cadr err)) + mm-security-handle 'gnus-details (mml2015-format-error err)) nil) (quit (mm-set-handle-multipart-parameter @@ -401,7 +406,7 @@ (buffer-string)))) (error (mm-set-handle-multipart-parameter - mm-security-handle 'gnus-details (cadr err)) + mm-security-handle 'gnus-details (mml2015-format-error err)) nil) (quit (mm-set-handle-multipart-parameter @@ -426,7 +431,7 @@ (buffer-string)))) (error (mm-set-handle-multipart-parameter - mm-security-handle 'gnus-details (cadr err)) + mm-security-handle 'gnus-details (mml2015-format-error err)) nil) (quit (mm-set-handle-multipart-parameter -- 1.7.10.4