X-Git-Url: http://git.hcoop.net/bpt/emacs.git/blobdiff_plain/412f24b9ddf1e07022f8c5fe05f0717f130c4c02..17e0445be4a6a4f437f4be4924074c90d6477481:/lisp/epa-file.el

diff --git a/lisp/epa-file.el b/lisp/epa-file.el
index aa9915d8cf..e3a91ac7c2 100644
--- a/lisp/epa-file.el
+++ b/lisp/epa-file.el
@@ -1,5 +1,5 @@
 ;;; epa-file.el --- the EasyPG Assistant, transparent file encryption -*- lexical-binding: t -*-
-;; Copyright (C) 2006-2011 Free Software Foundation, Inc.
+;; Copyright (C) 2006-2013 Free Software Foundation, Inc.
 
 ;; Author: Daiki Ueno <ueno@unixuser.org>
 ;; Keywords: PGP, GnuPG
@@ -29,13 +29,15 @@
   "If non-nil, cache passphrase for symmetric encryption.
 
 For security reasons, this option is turned off by default and
-not recommended to use.  Instead, consider using public-key
-encryption with gpg-agent which does the same job in a safer
-way."
+not recommended to use.  Instead, consider using gpg-agent which
+does the same job in a safer way.  See Info node `(epa) Caching
+Passphrases' for more information.
+
+Note that this option has no effect if you use GnuPG 2.0."
   :type 'boolean
   :group 'epa-file)
 
-(defcustom epa-file-select-keys 'silent
+(defcustom epa-file-select-keys nil
   "Control whether or not to pop up the key selection dialog.
 
 If t, always asks user to select recipients.
@@ -137,8 +139,10 @@ encryption is used."
      context
      (cons #'epa-file-passphrase-callback-function
 	   local-file))
-    (epg-context-set-progress-callback context
-				       #'epa-progress-callback-function)
+    (epg-context-set-progress-callback
+     context
+     (cons #'epa-progress-callback-function
+	   (format "Decrypting %s" file)))
     (unwind-protect
 	(progn
 	  (if replace
@@ -211,8 +215,10 @@ encryption is used."
      context
      (cons #'epa-file-passphrase-callback-function
 	   file))
-    (epg-context-set-progress-callback context
-				       #'epa-progress-callback-function)
+    (epg-context-set-progress-callback
+     context
+     (cons #'epa-progress-callback-function
+	   (format "Encrypting %s" file)))
     (epg-context-set-armor context epa-armor)
     (condition-case error
 	(setq string
@@ -231,7 +237,7 @@ encryption is used."
 						   (current-buffer)))))
 		   (epa-select-keys
 		    context
-		    "Select recipents for encryption.
+		    "Select recipients for encryption.
 If no one is selected, symmetric encryption will be performed.  "
 		    recipients)
 		 (if epa-file-encrypt-to
@@ -269,7 +275,7 @@ If no one is selected, symmetric encryption will be performed.  "
 	   (epg-sub-key-id (car (epg-key-sub-key-list key))))
 	(epa-select-keys
 	 (epg-make-context)
-	 "Select recipents for encryption.
+	 "Select recipients for encryption.
 If no one is selected, symmetric encryption will be performed.  "))))
 
 ;;;###autoload