aboutsummaryrefslogtreecommitdiffstats
path: root/lisp/epa.el
diff options
context:
space:
mode:
Diffstat (limited to 'lisp/epa.el')
-rw-r--r--lisp/epa.el22
1 files changed, 11 insertions, 11 deletions
diff --git a/lisp/epa.el b/lisp/epa.el
index 8d3315891b4..09208a0a3cc 100644
--- a/lisp/epa.el
+++ b/lisp/epa.el
@@ -702,7 +702,7 @@ If you do not specify PLAIN-FILE, this functions prompts for the value to use."
702 (epg-decrypt-file context decrypt-file plain-file) 702 (epg-decrypt-file context decrypt-file plain-file)
703 (error 703 (error
704 (epa-display-error context) 704 (epa-display-error context)
705 (signal (car error) (cdr error)))) 705 (signal error)))
706 (message "Decrypting %s...wrote %s" (file-name-nondirectory decrypt-file) 706 (message "Decrypting %s...wrote %s" (file-name-nondirectory decrypt-file)
707 (file-name-nondirectory plain-file)) 707 (file-name-nondirectory plain-file))
708 (if (epg-context-result-for context 'verify) 708 (if (epg-context-result-for context 'verify)
@@ -727,7 +727,7 @@ If you do not specify PLAIN-FILE, this functions prompts for the value to use."
727 (epg-verify-file context file plain) 727 (epg-verify-file context file plain)
728 (error 728 (error
729 (epa-display-error context) 729 (epa-display-error context)
730 (signal (car error) (cdr error)))) 730 (signal error)))
731 (message "Verifying %s...done" (file-name-nondirectory file)) 731 (message "Verifying %s...done" (file-name-nondirectory file))
732 (if (epg-context-result-for context 'verify) 732 (if (epg-context-result-for context 'verify)
733 (epa-display-info (epg-verify-result-to-string 733 (epa-display-info (epg-verify-result-to-string
@@ -798,7 +798,7 @@ If no one is selected, default secret key is used. "
798 (epg-sign-file context file signature mode) 798 (epg-sign-file context file signature mode)
799 (error 799 (error
800 (epa-display-error context) 800 (epa-display-error context)
801 (signal (car error) (cdr error)))) 801 (signal error)))
802 (message "Signing %s...wrote %s" (file-name-nondirectory file) 802 (message "Signing %s...wrote %s" (file-name-nondirectory file)
803 (file-name-nondirectory signature)))) 803 (file-name-nondirectory signature))))
804 804
@@ -828,7 +828,7 @@ If no one is selected, symmetric encryption will be performed. ")))
828 (epg-encrypt-file context file recipients cipher) 828 (epg-encrypt-file context file recipients cipher)
829 (error 829 (error
830 (epa-display-error context) 830 (epa-display-error context)
831 (signal (car error) (cdr error)))) 831 (signal error)))
832 (message "Encrypting %s...wrote %s" (file-name-nondirectory file) 832 (message "Encrypting %s...wrote %s" (file-name-nondirectory file)
833 (file-name-nondirectory cipher)))) 833 (file-name-nondirectory cipher))))
834 834
@@ -870,7 +870,7 @@ For example:
870 (setq plain (epg-decrypt-string context (buffer-substring start end))) 870 (setq plain (epg-decrypt-string context (buffer-substring start end)))
871 (error 871 (error
872 (epa-display-error context) 872 (epa-display-error context)
873 (signal (car error) (cdr error)))) 873 (signal error)))
874 (message "Decrypting...done") 874 (message "Decrypting...done")
875 (setq plain (decode-coding-string 875 (setq plain (decode-coding-string
876 plain 876 plain
@@ -969,7 +969,7 @@ For example:
969 (get-text-property start 'epa-coding-system-used))))) 969 (get-text-property start 'epa-coding-system-used)))))
970 (error 970 (error
971 (epa-display-error context) 971 (epa-display-error context)
972 (signal (car error) (cdr error)))) 972 (signal error)))
973 (message "Verifying...done") 973 (message "Verifying...done")
974 (setq plain (decode-coding-string 974 (setq plain (decode-coding-string
975 plain 975 plain
@@ -1077,7 +1077,7 @@ If no one is selected, default secret key is used. "
1077 mode)) 1077 mode))
1078 (error 1078 (error
1079 (epa-display-error context) 1079 (epa-display-error context)
1080 (signal (car error) (cdr error)))) 1080 (signal error)))
1081 (message "Signing...done") 1081 (message "Signing...done")
1082 (delete-region start end) 1082 (delete-region start end)
1083 (goto-char start) 1083 (goto-char start)
@@ -1155,7 +1155,7 @@ If no one is selected, symmetric encryption will be performed. ")
1155 sign)) 1155 sign))
1156 (error 1156 (error
1157 (epa-display-error context) 1157 (epa-display-error context)
1158 (signal (car error) (cdr error)))) 1158 (signal error)))
1159 (message "Encrypting...done") 1159 (message "Encrypting...done")
1160 (delete-region start end) 1160 (delete-region start end)
1161 (goto-char start) 1161 (goto-char start)
@@ -1185,7 +1185,7 @@ If no one is selected, symmetric encryption will be performed. ")
1185 (epg-delete-keys context keys allow-secret) 1185 (epg-delete-keys context keys allow-secret)
1186 (error 1186 (error
1187 (epa-display-error context) 1187 (epa-display-error context)
1188 (signal (car error) (cdr error)))) 1188 (signal error)))
1189 (message "Deleting...done") 1189 (message "Deleting...done")
1190 (apply #'epa--list-keys epa-list-keys-arguments))) 1190 (apply #'epa--list-keys epa-list-keys-arguments)))
1191 1191
@@ -1273,7 +1273,7 @@ If no one is selected, symmetric encryption will be performed. ")
1273 (epg-export-keys-to-file context keys file) 1273 (epg-export-keys-to-file context keys file)
1274 (error 1274 (error
1275 (epa-display-error context) 1275 (epa-display-error context)
1276 (signal (car error) (cdr error)))) 1276 (signal error)))
1277 (message "Exporting to %s...done" (file-name-nondirectory file)))) 1277 (message "Exporting to %s...done" (file-name-nondirectory file))))
1278 1278
1279;;;###autoload 1279;;;###autoload
@@ -1290,7 +1290,7 @@ If no one is selected, default public key is exported. ")))
1290 (insert (epg-export-keys-to-string context keys)) 1290 (insert (epg-export-keys-to-string context keys))
1291 (error 1291 (error
1292 (epa-display-error context) 1292 (epa-display-error context)
1293 (signal (car error) (cdr error)))))) 1293 (signal error)))))
1294 1294
1295(provide 'epa) 1295(provide 'epa)
1296 1296