aboutsummaryrefslogtreecommitdiffstats
path: root/lisp/epa-mail.el
diff options
context:
space:
mode:
authorStefan Monnier <[email protected]>2010-08-11 07:42:48 +0200
committerStefan Monnier <[email protected]>2010-08-11 07:42:48 +0200
commitc566235d981eba73c88bbff00b6a1d88360b6e9f (patch)
treef8d653add3570fe750a83d1123ed35022e0bf4ef /lisp/epa-mail.el
parent0bfdb86f425a88fe43ebc88851c6f9a6418e1862 (diff)
parent490b89acab3e759426ede25c31c94268df55e925 (diff)
Merge from trunk
Diffstat (limited to 'lisp/epa-mail.el')
-rw-r--r--lisp/epa-mail.el6
1 files changed, 6 insertions, 0 deletions
diff --git a/lisp/epa-mail.el b/lisp/epa-mail.el
index b3c31fe435..69fb6d7d7e 100644
--- a/lisp/epa-mail.el
+++ b/lisp/epa-mail.el
@@ -32,6 +32,12 @@
(define-key keymap "\C-c\C-ee" 'epa-mail-encrypt)
(define-key keymap "\C-c\C-ei" 'epa-mail-import-keys)
(define-key keymap "\C-c\C-eo" 'epa-insert-keys)
+ (define-key keymap "\C-c\C-e\C-d" 'epa-mail-decrypt)
+ (define-key keymap "\C-c\C-e\C-v" 'epa-mail-verify)
+ (define-key keymap "\C-c\C-e\C-s" 'epa-mail-sign)
+ (define-key keymap "\C-c\C-e\C-e" 'epa-mail-encrypt)
+ (define-key keymap "\C-c\C-e\C-i" 'epa-mail-import-keys)
+ (define-key keymap "\C-c\C-e\C-o" 'epa-insert-keys)
keymap))
(defvar epa-mail-mode-hook nil)