* lisp/epa-file.el (epa-file-select-keys): Revert to nil default.

Fixes: debbugs:9280

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 27515f767fbeae6cd66ef0bebe38e5be088d1226..a75c5330ed909d0b8b1c360154bd7c1fc7857bab 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,7 @@
+2011-08-12  Stefan Monnier  <monnier@iro.umontreal.ca>
+
+       * epa-file.el (epa-file-select-keys): Revert to nil default (bug#9280).
+
 2011-08-12  Daiki Ueno  <ueno@unixuser.org>
 
        * epa.el (epa-progress-callback-function): Fix the logic of
@@ -14,8 +18,8 @@
        Use string-mark-left-to-right.
        (list-buffers-noselect): Caller changed.
 
-       * emacs-lisp/tabulated-list.el (tabulated-list-print-entry): Use
-       string-mark-left-to-right.
+       * emacs-lisp/tabulated-list.el (tabulated-list-print-entry):
+       Use string-mark-left-to-right.
        (tabulated-list-print): Recenter after moving point.
 
 2011-08-10  Juri Linkov  <juri@jurta.org>

diff --git a/lisp/epa-file.el b/lisp/epa-file.el
index 118f44854cf5c3792a985b8621a7b693574f2501..bef67ba4f699601efff5e810065f6e4aa0424bf2 100644 (file)
--- a/lisp/epa-file.el
+++ b/lisp/epa-file.el
@@ -35,7 +35,7 @@ way."
   :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.