From 3b6462c5780931b990fd1448b447798ff9da1ff3 Mon Sep 17 00:00:00 2001 From: ueno Date: Sun, 31 Dec 2006 09:06:07 +0000 Subject: [PATCH] * epa.el (epa-progress-callback-function): Use handback as the prompt. --- ChangeLog | 1 + epa.el | 40 +++++++++++++++++++++++++++------------- 2 files changed, 28 insertions(+), 13 deletions(-) diff --git a/ChangeLog b/ChangeLog index db6dd1d..1bfd2db 100644 --- a/ChangeLog +++ b/ChangeLog @@ -6,6 +6,7 @@ (epa-encrypt): Use it. (epa--find-coding-system-for-mime-charset): New function. (epa-decrypt-armor-in-region): Use it. + (epa-progress-callback-function): Use handback as the prompt. 2006-12-31 Daiki Ueno diff --git a/epa.el b/epa.el index 8db243e..1ab5908 100644 --- a/epa.el +++ b/epa.el @@ -604,7 +604,8 @@ If SECRET is non-nil, list secret keys instead of public keys." (defun epa-progress-callback-function (context what char current total handback) - (message "%s: %d%% (%d/%d)" what + (message "%s%d%% (%d/%d)" (or handback + (concat what ": ")) (if (> total 0) (floor (* (/ current (float total)) 100)) 0) current total)) @@ -625,7 +626,9 @@ If SECRET is non-nil, list secret keys instead of public keys." (epg-context-set-passphrase-callback context #'epa-passphrase-callback-function) (epg-context-set-progress-callback context - #'epa-progress-callback-function) + #'epa-progress-callback-function + (format "Decrypting %s..." + (file-name-nondirectory file))) (message "Decrypting %s..." (file-name-nondirectory file)) (epg-decrypt-file context file plain) (message "Decrypting %s...wrote %s" (file-name-nondirectory file) @@ -643,7 +646,9 @@ If SECRET is non-nil, list secret keys instead of public keys." (plain (if (equal (file-name-extension file) "sig") (file-name-sans-extension file)))) (epg-context-set-progress-callback context - #'epa-progress-callback-function) + #'epa-progress-callback-function + (format "Verifying %s..." + (file-name-nondirectory file))) (message "Verifying %s..." (file-name-nondirectory file)) (epg-verify-file context file plain) (message "Verifying %s...done" (file-name-nondirectory file)) @@ -705,7 +710,9 @@ If no one is selected, default secret key is used. " (epg-context-set-passphrase-callback context #'epa-passphrase-callback-function) (epg-context-set-progress-callback context - #'epa-progress-callback-function) + #'epa-progress-callback-function + (format "Signing %s..." + (file-name-nondirectory file))) (message "Signing %s..." (file-name-nondirectory file)) (epg-sign-file context file signature mode) (message "Signing %s...wrote %s" (file-name-nondirectory file) @@ -728,7 +735,9 @@ If no one is selected, symmetric encryption will be performed. "))) (epg-context-set-passphrase-callback context #'epa-passphrase-callback-function) (epg-context-set-progress-callback context - #'epa-progress-callback-function) + #'epa-progress-callback-function + (format "Encrypting %s..." + (file-name-nondirectory file))) (message "Encrypting %s..." (file-name-nondirectory file)) (epg-encrypt-file context file recipients cipher) (message "Encrypting %s...wrote %s" (file-name-nondirectory file) @@ -746,7 +755,8 @@ Don't use this command in Lisp programs!" (epg-context-set-passphrase-callback context #'epa-passphrase-callback-function) (epg-context-set-progress-callback context - #'epa-progress-callback-function) + #'epa-progress-callback-function + "Decrypting...") (message "Decrypting...") (setq plain (epg-decrypt-string context (buffer-substring start end))) (message "Decrypting...done") @@ -823,7 +833,8 @@ Don't use this command in Lisp programs!" (interactive "r") (let ((context (epg-make-context epa-protocol))) (epg-context-set-progress-callback context - #'epa-progress-callback-function) + #'epa-progress-callback-function + "Verifying...") (epg-verify-string context (epa--encode-coding-string (buffer-substring start end) @@ -898,7 +909,8 @@ If no one is selected, default secret key is used. " (epg-context-set-passphrase-callback context #'epa-passphrase-callback-function) (epg-context-set-progress-callback context - #'epa-progress-callback-function) + #'epa-progress-callback-function + "Signing...") (message "Signing...") (setq signature (epg-sign-string context (epa--encode-coding-string @@ -989,7 +1001,8 @@ If no one is selected, symmetric encryption will be performed. ")))) (epg-context-set-passphrase-callback context #'epa-passphrase-callback-function) (epg-context-set-progress-callback context - #'epa-progress-callback-function) + #'epa-progress-callback-function + "Encrypting...") (message "Encrypting...") (setq cipher (epg-encrypt-string context (epa--encode-coding-string @@ -1022,9 +1035,9 @@ Don't use this command in Lisp programs!" (when (epa--mail-mode-p) (save-restriction (narrow-to-region (point) - (progn - (search-forward mail-header-separator nil 0) - (match-beginning 0))) + (if (search-forward mail-header-separator nil 0) + (match-beginning 0) + (point))) (setq recipients (mail-strip-quoted-names (mapconcat #'identity @@ -1203,7 +1216,8 @@ Don't use this command in Lisp programs!" (epg-context-set-passphrase-callback context #'epa-passphrase-callback-function) (epg-context-set-progress-callback context - #'epa-progress-callback-function) + #'epa-progress-callback-function + "Signing keys...") (message "Signing keys...") (epg-sign-keys context keys local) (message "Signing keys...done"))) -- 1.7.10.4