gnus-sum.el (gnus-summary-show-article): Don't load shr unconditionally.

[gnu-emacs] / lisp / epa-file.el

diff --git a/lisp/epa-file.el b/lisp/epa-file.el
index 1f9500ded8167928b512bd1010c99dab1b6c9f88..bef67ba4f699601efff5e810065f6e4aa0424bf2 100644 (file)
--- a/lisp/epa-file.el
+++ b/lisp/epa-file.el
@@ -1,5 +1,5 @@
-;;; epa-file.el --- the EasyPG Assistant, transparent file encryption
-;; Copyright (C) 2006, 2007, 2008, 2009, 2010, 2011 Free Software Foundation, Inc.
+;;; epa-file.el --- the EasyPG Assistant, transparent file encryption -*- lexical-binding: t -*-
+;; Copyright (C) 2006-2011 Free Software Foundation, Inc.

 
 ;; Author: Daiki Ueno <ueno@unixuser.org>
 ;; Keywords: PGP, GnuPG
 
 ;; Author: Daiki Ueno <ueno@unixuser.org>
 ;; Keywords: PGP, GnuPG


@@ -35,7 +35,7 @@ way."
   :type 'boolean
   :group 'epa-file)
 
   :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.
   "Control whether or not to pop up the key selection dialog.
 
 If t, always asks user to select recipients.


@@ -137,8 +137,10 @@ encryption is used."
      context
      (cons #'epa-file-passphrase-callback-function
           local-file))
      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
     (unwind-protect
        (progn
          (if replace


@@ -211,8 +213,10 @@ encryption is used."
      context
      (cons #'epa-file-passphrase-callback-function
           file))
      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
     (epg-context-set-armor context epa-armor)
     (condition-case error
        (setq string


@@ -298,5 +302,4 @@ If no one is selected, symmetric encryption will be performed.  "))))
 
 (provide 'epa-file)
 
 
 (provide 'epa-file)
 

-;; arch-tag: 5715152f-0eb1-4dbc-9008-07098775314d

 ;;; epa-file.el ends here
 ;;; epa-file.el ends here