X-Git-Url: http://git.chise.org/gitweb/?a=blobdiff_plain;f=epa.el;h=043ffd6194b766fa5b5474332fb609c0fccf791e;hb=1e72feccfd861a57c5f86b154f1fb42af731c853;hp=462847bc23009b0a97d28d8686d08c82f95f81bb;hpb=f5832cccfdff99ce510369cf39148738e703ba7e;p=elisp%2Fepg.git diff --git a/epa.el b/epa.el index 462847b..043ffd6 100644 --- a/epa.el +++ b/epa.el @@ -153,8 +153,9 @@ (define-key keymap "v" 'epa-verify-file) (define-key keymap "s" 'epa-sign-file) (define-key keymap "e" 'epa-encrypt-file) - (define-key keymap "r" 'epa-delete-key) - (define-key keymap "i" 'epa-import-key) + (define-key keymap "r" 'epa-delete-keys) + (define-key keymap "i" 'epa-import-keys) + (define-key keymap "o" 'epa-export-keys) (define-key keymap "g" 'epa-list-keys) (define-key keymap "n" 'next-line) (define-key keymap "p" 'previous-line) @@ -253,8 +254,15 @@ (setq epa-keys-buffer (generate-new-buffer "*Keys*"))) (set-buffer epa-keys-buffer) (let ((inhibit-read-only t) - buffer-read-only) - (erase-buffer) + buffer-read-only + (point (point-min))) + (unless (get-text-property point 'epa-list-keys) + (setq point (next-single-property-change point 'epa-list-keys))) + (when point + (delete-region point + (or (next-single-property-change point 'epa-list-keys) + (point-max))) + (goto-char point)) (epa-list-keys-1 name mode) (epa-keys-mode)) (make-local-variable 'epa-list-keys-arguments) @@ -263,19 +271,36 @@ (pop-to-buffer (current-buffer))) (defun epa-list-keys-1 (name mode) - (let ((inhibit-read-only t) - buffer-read-only - (keys (epg-list-keys name mode)) - point) - (while keys - (setq point (point)) - (insert " ") - (put-text-property point (point) 'epa-key (car keys)) - (widget-create 'epa-key :value (car keys)) - (insert "\n") - (setq keys (cdr keys))))) - -(defun epa-select-keys (prompt &optional names) + (save-restriction + (narrow-to-region (point) (point)) + (let ((inhibit-read-only t) + buffer-read-only + (keys (epg-list-keys name mode)) + point) + (while keys + (setq point (point)) + (insert " ") + (put-text-property point (point) 'epa-key (car keys)) + (widget-create 'epa-key :value (car keys)) + (insert "\n") + (setq keys (cdr keys)))) + (put-text-property (point-min) (point-max) 'epa-list-keys t))) + +(defun epa-marked-keys () + (or (save-excursion + (set-buffer epa-keys-buffer) + (goto-char (point-min)) + (let (keys key) + (while (re-search-forward "^\\*" nil t) + (if (setq key (get-text-property (match-beginning 0) + 'epa-key)) + (setq keys (cons key keys)))) + (nreverse keys))) + (save-excursion + (beginning-of-line) + (get-text-property (point) 'epa-key)))) + +(defun epa-select-keys (prompt &optional names mode) (save-excursion (unless (and epa-keys-buffer (buffer-live-p epa-keys-buffer)) @@ -287,6 +312,12 @@ (erase-buffer) (insert prompt "\n") (widget-create 'link + :notify (lambda (&rest ignore) (abort-recursive-edit)) + :help-echo + (substitute-command-keys + "Click here or \\[abort-recursive-edit] to cancel") + "Cancel") + (widget-create 'link :notify (lambda (&rest ignore) (exit-recursive-edit)) :help-echo (substitute-command-keys @@ -296,27 +327,19 @@ (if names (while names (setq point (point)) - (epa-list-keys-1 (car names) nil) + (epa-list-keys-1 (car names) mode) (goto-char point) (epa-mark) (goto-char (point-max)) (setq names (cdr names))) - (epa-list-keys-1 nil nil)) + (epa-list-keys-1 nil mode)) (epa-keys-mode) (goto-char (point-min)) (pop-to-buffer (current-buffer)) (unwind-protect (progn (recursive-edit) - (save-excursion - (set-buffer epa-keys-buffer) - (goto-char (point-min)) - (let (keys key) - (while (re-search-forward "^\\*" nil t) - (if (setq key (get-text-property (match-beginning 0) - 'epa-key)) - (setq keys (cons key keys)))) - (nreverse keys)))) + (epa-marked-keys)) (if (get-buffer-window epa-keys-buffer) (delete-window (get-buffer-window epa-keys-buffer))) (kill-buffer epa-keys-buffer))))) @@ -425,23 +448,13 @@ (interactive "fFile: ") (let* ((context (epg-make-context)) (plain (if (equal (file-name-extension file) "sig") - (file-name-sans-extension file))) - signature) + (file-name-sans-extension file)))) (message "Verifying %s..." (file-name-nondirectory file)) (epg-verify-file context file plain) - (setq signature (reverse (epg-context-result-for context 'verify))) - (with-output-to-temp-buffer "*epa-verify-file*" - (set-buffer standard-output) - (while signature - (insert (format "%s: %s %s %s\n" - (epg-signature-status (car signature)) - (epg-signature-key-id (car signature)) - (epg-signature-user-id (car signature)) - (epg-signature-validity (car signature)))) - (setq signature (cdr signature)))) - (shrink-window-if-larger-than-buffer - (get-buffer-window "*epa-verify-file*")) - (message "Verifying %s...done" (file-name-nondirectory file)))) + (message "Verifying %s...done" (file-name-nondirectory file)) + (message "%s" + (epg-verify-result-to-string + (epg-context-result-for context 'verify))))) (defun epa-sign-file (file detached) (interactive @@ -456,42 +469,58 @@ (defun epa-encrypt-file (file recipients) (interactive (list (expand-file-name (read-file-name "File: ")) - (mapcar (lambda (key) - (epg-sub-key-id - (car (epg-key-sub-key-list key)))) - (epa-select-keys "Select recipents for encryption. -If no one is selected, symmetric encryption will be performed. ")))) + (epa-select-keys "Select recipents for encryption. +If no one is selected, symmetric encryption will be performed. "))) (let ((cipher (concat file ".gpg")) (context (epg-make-context))) (message "Encrypting %s..." (file-name-nondirectory file)) - (epg-encrypt-file context - file - recipients - cipher) + (epg-encrypt-file context file recipients cipher) (message "Encrypting %s...done" (file-name-nondirectory file)))) -(defun epa-delete-key (key) +(defun epa-delete-keys (keys) (interactive - (list - (save-excursion - (beginning-of-line) - (get-text-property (point) 'epa-key)))) + (let ((keys (epa-marked-keys))) + (unless keys + (error "No keys selected")) + (list keys))) (let ((context (epg-make-context))) - (message "Deleting %s..." - (epg-sub-key-id (car (epg-key-sub-key-list key)))) - (epg-delete-key context key) + (message "Deleting...") + (epg-delete-keys context keys) (apply #'epa-list-keys epa-list-keys-arguments) - (message "Deleting %s...done" - (epg-sub-key-id (car (epg-key-sub-key-list key)))))) + (message "Deleting...done"))) -(defun epa-import-key (file) +(defun epa-import-keys (file) (interactive "fFile: ") (let ((context (epg-make-context))) (message "Importing %s..." (file-name-nondirectory file)) - (epg-import-key context file) + (epg-import-keys-from-file context (expand-file-name file)) (apply #'epa-list-keys epa-list-keys-arguments) (message "Importing %s...done" (file-name-nondirectory file)))) +(defun epa-export-keys (keys file) + (interactive + (let ((keys (epa-marked-keys)) + default-name) + (unless keys + (error "No keys selected")) + (setq default-name + (expand-file-name + (concat (epg-sub-key-id (car (epg-key-sub-key-list (car keys)))) + ".gpg") + default-directory)) + (list keys + (expand-file-name + (read-file-name + (concat "To file (default " + (file-name-nondirectory default-name) + ") ") + (file-name-directory default-name) + default-name))))) + (let ((context (epg-make-context))) + (message "Exporting to %s..." (file-name-nondirectory file)) + (epg-export-keys-to-file context keys file) + (message "Exporting to %s...done" (file-name-nondirectory file)))) + (provide 'epa) ;;; epa.el ends here