From 1750e2f3d7b84648182886bfc282291a69a863d2 Mon Sep 17 00:00:00 2001 From: ueno Date: Tue, 25 Apr 2006 06:03:43 +0000 Subject: [PATCH] Fixed error message. --- epg.el | 48 ++++++++++++++++++++++++++++++++++-------------- 1 file changed, 34 insertions(+), 14 deletions(-) diff --git a/epg.el b/epg.el index b32d57a..0cf9722 100644 --- a/epg.el +++ b/epg.el @@ -1235,9 +1235,14 @@ Otherwise, it makes a normal signature." (epg-make-temp-file "epg-output"))) (epg-start-sign context (epg-make-data-from-file plain) mode) (epg-wait-for-completion context) - (unless (epg-context-result-for context 'sign) - (error "Sign failed: %S" - (epg-context-result-for context 'error))) + (if (epg-context-result-for context 'sign) + (if (epg-context-result-for context 'error) + (message "Sign error: %S" + (epg-context-result-for context 'error))) + (if (epg-context-result-for context 'error) + (error "Sign failed: %S" + (epg-context-result-for context 'error)) + (error "Sign failed"))) (unless signature (epg-read-output context))) (unless signature @@ -1257,9 +1262,14 @@ Otherwise, it makes a normal signature." (epg-start-sign context (epg-make-data-from-string plain) mode) (epg-flush context) (epg-wait-for-completion context) - (unless (epg-context-result-for context 'sign) - (error "Sign failed: %S" - (epg-context-result-for context 'error))) + (if (epg-context-result-for context 'sign) + (if (epg-context-result-for context 'error) + (message "Sign error: %S" + (epg-context-result-for context 'error))) + (if (epg-context-result-for context 'error) + (error "Sign failed: %S" + (epg-context-result-for context 'error)) + (error "Sign failed"))) (epg-read-output context)) (epg-delete-output-file context) (epg-reset context))) @@ -1320,10 +1330,15 @@ If RECIPIENTS is nil, it performs symmetric encryption." (epg-start-encrypt context (epg-make-data-from-file plain) recipients sign always-trust) (epg-wait-for-completion context) - (if (and sign - (not (epg-context-result-for context 'sign))) - (error "Sign encrypt failed: %S" - (epg-context-result-for context 'error))) + (if sign + (if (epg-context-result-for context 'sign) + (if (epg-context-result-for context 'error) + (message "Sign error: %S" + (epg-context-result-for context 'error))) + (if (epg-context-result-for context 'error) + (error "Sign failed: %S" + (epg-context-result-for context 'error)) + (error "Sign failed")))) (if (epg-context-result-for context 'error) (error "Encrypt failed: %S" (epg-context-result-for context 'error))) @@ -1346,10 +1361,15 @@ If RECIPIENTS is nil, it performs symmetric encryption." recipients sign always-trust) (epg-flush context) (epg-wait-for-completion context) - (if (and sign - (not (epg-context-result-for context 'sign))) - (error "Sign encrypt failed: %S" - (epg-context-result-for context 'error))) + (if sign + (if (epg-context-result-for context 'sign) + (if (epg-context-result-for context 'error) + (message "Sign error: %S" + (epg-context-result-for context 'error))) + (if (epg-context-result-for context 'error) + (error "Sign failed: %S" + (epg-context-result-for context 'error)) + (error "Sign failed")))) (if (epg-context-result-for context 'error) (error "Encrypt failed: %S" (epg-context-result-for context 'error))) -- 1.7.10.4