From 9d4481cdaffc16cd78edff44728d75add4a3741c Mon Sep 17 00:00:00 2001 From: ueno Date: Tue, 18 Apr 2006 10:08:04 +0000 Subject: [PATCH] expand-file-name, etc. --- epa.el | 2 +- epg.el | 8 +++++--- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/epa.el b/epa.el index 089aee0..dea687e 100644 --- a/epa.el +++ b/epa.el @@ -493,7 +493,7 @@ If no one is selected, symmetric encryption will be performed. ")))) (interactive "fFile: ") (let ((context (epg-make-context))) (message "Importing %s..." (file-name-nondirectory file)) - (epg-import-keys-from-file context file) + (epg-import-keys-from-file context (expand-file-name file)) (apply #'epa-list-keys epa-list-keys-arguments) (message "Importing %s...done" (file-name-nondirectory file)))) diff --git a/epg.el b/epg.el index e5fb6cd..8a70d21 100644 --- a/epg.el +++ b/epg.el @@ -1190,7 +1190,8 @@ If you are unsure, use synchronous version of this function (epg-start context (cons "--export" (mapcar (lambda (key) - (epg-sub-key-id (epg-key-sub-key-list key))) + (epg-sub-key-id + (car (epg-key-sub-key-list key)))) keys)))) ;;;###autoload @@ -1229,7 +1230,7 @@ If you are unsure, use synchronous version of this function `epg-import-keys-from-file' or `epg-import-keys-from-string' instead." (epg-context-set-result context nil) (epg-context-set-output-file context (epg-make-temp-file "epg-output")) - (epg-start context (append (list "--import") (epg-data-file keys))) + (epg-start context (list "--import" (epg-data-file keys))) (if (and (epg-data-string keys) (eq (process-status (epg-context-process context)) 'run)) (process-send-string (epg-context-process context) @@ -1270,7 +1271,8 @@ If you are unsure, use synchronous version of this function "--delete-key") (mapcar (lambda (key) - (epg-sub-key-id (epg-key-sub-key-list key))) + (epg-sub-key-id + (car (epg-key-sub-key-list key)))) keys)))) ;;;###autoload -- 1.7.10.4