aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDan Nicolaescu2008-04-30 05:44:17 +0000
committerDan Nicolaescu2008-04-30 05:44:17 +0000
commit703b961194aba79bed93bc9905eb444d20ce1552 (patch)
treedf7e9761c2ae5e9bcf4a095dc4e06ff569f6f850
parent4b33a64a24a7c7514f0e50bf094336fa3680d0ee (diff)
downloademacs-703b961194aba79bed93bc9905eb444d20ce1552.tar.gz
emacs-703b961194aba79bed93bc9905eb444d20ce1552.zip
(epa-key-list-mode-map): Add more menu entries.
Add ... in the appropriate places.
-rw-r--r--lisp/ChangeLog3
-rw-r--r--lisp/epa.el34
2 files changed, 26 insertions, 11 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 1499f15a921..7b3cd0ffd89 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,5 +1,8 @@
12008-04-30 Dan Nicolaescu <dann@ics.uci.edu> 12008-04-30 Dan Nicolaescu <dann@ics.uci.edu>
2 2
3 * epa.el (epa-key-list-mode-map): Add more menu entries.
4 Add ... in the appropriate places.
5
3 * dired.el (dired-mode-map): Add :help. 6 * dired.el (dired-mode-map): Add :help.
4 7
5 * vc.el (vc-deduce-fileset): Add new parameter. 8 * vc.el (vc-deduce-fileset): Add new parameter.
diff --git a/lisp/epa.el b/lisp/epa.el
index 8d20a61ecea..9e02b6443b6 100644
--- a/lisp/epa.el
+++ b/lisp/epa.el
@@ -219,23 +219,35 @@ You should bind this variable with `let', but do not set it globally.")
219 (define-key keymap [delete] 'scroll-down) 219 (define-key keymap [delete] 'scroll-down)
220 (define-key keymap "q" 'epa-exit-buffer) 220 (define-key keymap "q" 'epa-exit-buffer)
221 (define-key keymap [menu-bar epa-key-list-mode] (cons "Keys" menu-map)) 221 (define-key keymap [menu-bar epa-key-list-mode] (cons "Keys" menu-map))
222 (define-key menu-map [epa-key-list-unmark-key]
223 '(menu-item "Unmark Key" epa-unmark-key
224 :help "Unmark a key"))
225 (define-key menu-map [epa-key-list-mark-key]
226 '(menu-item "Mark Key" epa-mark-key
227 :help "Mark a key"))
228 (define-key menu-map [separator-epa-file] '(menu-item "--"))
229 (define-key menu-map [epa-verify-file]
230 '(menu-item "Verify File..." epa-verify-file
231 :help "Verify FILE"))
232 (define-key menu-map [epa-sign-file]
233 '(menu-item "Sign File..." epa-sign-file
234 :help "Sign FILE by SIGNERS keys selected"))
235 (define-key menu-map [epa-decrypt-file]
236 '(menu-item "Decrypt File..." epa-decrypt-file
237 :help "Decrypt FILE"))
238 (define-key menu-map [epa-encrypt-file]
239 '(menu-item "Encrypt File.." epa-encrypt-file
240 :help "Encrypt FILE for RECIPIENTS"))
241 (define-key menu-map [separator-epa-key-list] '(menu-item "--"))
222 (define-key menu-map [epa-key-list-delete-keys] 242 (define-key menu-map [epa-key-list-delete-keys]
223 '(menu-item "Delete keys" epa-delete-keys 243 '(menu-item "Delete keys" epa-delete-keys
224 :help "Delete marked keys")) 244 :help "Delete Marked Keys"))
225 (define-key menu-map [epa-key-list-import-keys] 245 (define-key menu-map [epa-key-list-import-keys]
226 '(menu-item "Import keys" epa-import-keys 246 '(menu-item "Import Keys" epa-import-keys
227 :help "Import keys from a file")) 247 :help "Import keys from a file"))
228 (define-key menu-map [epa-key-list-export-keys] 248 (define-key menu-map [epa-key-list-export-keys]
229 '(menu-item "Export keys" epa-export-keys 249 '(menu-item "Export Keys" epa-export-keys
230 :help "Export marked keys to a file")) 250 :help "Export marked keys to a file"))
231 (define-key menu-map [separator-epa-key-list]
232 '(menu-item "--"))
233 (define-key menu-map [epa-key-list-unmark-key]
234 '(menu-item "Unmark key" epa-unmark-key
235 :help "Unmark a key"))
236 (define-key menu-map [epa-key-list-mark-key]
237 '(menu-item "Mark key" epa-mark-key
238 :help "Mark a key"))
239 keymap)) 251 keymap))
240 252
241(defvar epa-key-mode-map 253(defvar epa-key-mode-map