2 files changed, 11 insertions, 1 deletions

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 75a3af814c5..4e59dd65b2d 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,10 @@
+2012-04-04  Daiki Ueno  <ueno@unixuser.org>
+
+        * epa.el (epa--select-keys): Bind C-c C-c to finish the key
+        selection (Bug#11159).
+        (epa-insert-keys): Inform that the default public key will be
+        exported if no key is selected.
+
 2012-04-04  Richard Stallman  <rms@gnu.org>
 
         * mail/emacsbug.el (report-emacs-bug): Bind inhibit-read-only.
diff --git a/lisp/epa.el b/lisp/epa.el
index 4ce9aeeee7c..3b9933f6984 100644
--- a/lisp/epa.el
+++ b/lisp/epa.el
@@ -482,6 +482,8 @@ If ARG is non-nil, mark the key."
     (setq epa-keys-buffer (generate-new-buffer "*Keys*")))
   (with-current-buffer epa-keys-buffer
     (epa-key-list-mode)
+    ;; C-c C-c is the usual way to finish the selection (bug#11159).
+    (define-key (current-local-map) "\C-c\C-c" 'exit-recursive-edit)
     (let ((inhibit-read-only t)
           buffer-read-only)
       (erase-buffer)
@@ -1236,7 +1238,8 @@ between START and END."
   "Insert selected KEYS after the point."
   (interactive
    (list (epa-select-keys (epg-make-context epa-protocol)
-                          "Select keys to export.  ")))
+                                "Select keys to export.
+If no one is selected, default public key is exported.  ")))
   (let ((context (epg-make-context epa-protocol)))
     ;;(epg-context-set-armor context epa-armor)
     (epg-context-set-armor context t)