diff options
Diffstat (limited to 'lisp/epa.el')
| -rw-r--r-- | lisp/epa.el | 62 |
1 files changed, 29 insertions, 33 deletions
diff --git a/lisp/epa.el b/lisp/epa.el index 572c947e4b2..2698b39ffe3 100644 --- a/lisp/epa.el +++ b/lisp/epa.el @@ -183,8 +183,7 @@ You should bind this variable with `let', but do not set it globally.") (defvar epa-last-coding-system-specified nil) (defvar epa-key-list-mode-map - (let ((keymap (make-sparse-keymap)) - (menu-map (make-sparse-keymap))) + (let ((keymap (make-sparse-keymap))) (define-key keymap "\C-m" 'epa-show-key) (define-key keymap [?\t] 'forward-button) (define-key keymap [backtab] 'backward-button) @@ -204,38 +203,32 @@ You should bind this variable with `let', but do not set it globally.") (define-key keymap [?\S-\ ] 'scroll-down-command) (define-key keymap [delete] 'scroll-down-command) (define-key keymap "q" 'epa-exit-buffer) - (define-key keymap [menu-bar epa-key-list-mode] (cons "Keys" menu-map)) - (define-key menu-map [epa-key-list-unmark-key] - '(menu-item "Unmark Key" epa-unmark-key - :help "Unmark a key")) - (define-key menu-map [epa-key-list-mark-key] - '(menu-item "Mark Key" epa-mark-key - :help "Mark a key")) - (define-key menu-map [separator-epa-file] '(menu-item "--")) - (define-key menu-map [epa-verify-file] - '(menu-item "Verify File..." epa-verify-file - :help "Verify FILE")) - (define-key menu-map [epa-sign-file] - '(menu-item "Sign File..." epa-sign-file - :help "Sign FILE by SIGNERS keys selected")) - (define-key menu-map [epa-decrypt-file] - '(menu-item "Decrypt File..." epa-decrypt-file - :help "Decrypt FILE")) - (define-key menu-map [epa-encrypt-file] - '(menu-item "Encrypt File..." epa-encrypt-file - :help "Encrypt FILE for RECIPIENTS")) - (define-key menu-map [separator-epa-key-list] '(menu-item "--")) - (define-key menu-map [epa-key-list-delete-keys] - '(menu-item "Delete Keys" epa-delete-keys - :help "Delete Marked Keys")) - (define-key menu-map [epa-key-list-import-keys] - '(menu-item "Import Keys" epa-import-keys - :help "Import keys from a file")) - (define-key menu-map [epa-key-list-export-keys] - '(menu-item "Export Keys" epa-export-keys - :help "Export marked keys to a file")) keymap)) +(easy-menu-define epa-key-list-mode-menu epa-key-list-mode-map + "Menu for `epa-key-list-mode'." + '("Keys" + ["Export Keys" epa-export-keys + :help "Export marked keys to a file"] + ["Import Keys" epa-import-keys + :help "Import keys from a file"] + ["Delete Keys" epa-delete-keys + :help "Delete Marked Keys"] + "---" + ["Encrypt File..." epa-encrypt-file + :help "Encrypt file for recipients"] + ["Decrypt File..." epa-decrypt-file + :help "Decrypt file"] + ["Sign File..." epa-sign-file + :help "Sign file by signers keys selected"] + ["Verify File..." epa-verify-file + :help "Verify file"] + "---" + ["Mark Key" epa-mark-key + :help "Mark a key"] + ["Unmark Key" epa-unmark-key + :help "Unmark a key"])) + (defvar epa-key-mode-map (let ((keymap (make-sparse-keymap))) (define-key keymap "q" 'epa-exit-buffer) @@ -340,7 +333,10 @@ If ARG is non-nil, mark the key." (insert (propertize (concat " " (epa--button-key-text key)) - 'epa-key key)) + 'epa-key key + ;; Allow TAB to tab to the key. + 'button t + 'category t)) (insert "\n"))) (defun epa--list-keys (name secret &optional doc) |