X-Git-Url: http://git.chise.org/gitweb/?a=blobdiff_plain;f=epa.el;h=cb0cb3bcf7478ef7d4eecba3f2a7de6f5f3e4113;hb=c3f7df32c68315e9c66b2a9a0f3e181771c79890;hp=6425d19882588d144389c03fb4f8a74353be2602;hpb=c9657bb821e19b47cbfd2c36912e95bfadfada24;p=elisp%2Fepg.git diff --git a/epa.el b/epa.el index 6425d19..cb0cb3b 100644 --- a/epa.el +++ b/epa.el @@ -42,6 +42,17 @@ :type 'boolean :group 'epa) +(defcustom epa-popup-info-window nil + "If non-nil, status information from epa commands is displayed on +the separate window." + :type 'boolean + :group 'epa) + +(defcustom epa-info-window-height 5 + "Number of lines used to display status information." + :type 'integer + :group 'epa) + (defgroup epa-faces nil "Faces for epa-mode." :group 'epa) @@ -154,6 +165,7 @@ (defvar epa-key-buffer-alist nil) (defvar epa-key nil) (defvar epa-list-keys-arguments nil) +(defvar epa-info-buffer nil) (defvar epa-keys-mode-map (let ((keymap (make-sparse-keymap))) @@ -175,6 +187,16 @@ (define-key keymap "q" 'epa-exit-buffer) keymap)) +(defvar epa-key-mode-map + (let ((keymap (make-sparse-keymap))) + (define-key keymap "q" 'bury-buffer) + keymap)) + +(defvar epa-info-mode-map + (let ((keymap (make-sparse-keymap))) + (define-key keymap "q" 'delete-window) + keymap)) + (defvar epa-exit-buffer-function #'bury-buffer) (define-widget 'epa-key 'push-button @@ -234,11 +256,6 @@ (make-local-variable 'epa-exit-buffer-function) (run-hooks 'epa-keys-mode-hook)) -(defvar epa-key-mode-map - (let ((keymap (make-sparse-keymap))) - (define-key keymap "q" 'bury-buffer) - keymap)) - (defun epa-key-mode () "Major mode for `epa-show-key'." (kill-all-local-variables) @@ -284,28 +301,37 @@ (or (next-single-property-change point 'epa-list-keys) (point-max))) (goto-char point)) - (epa-list-keys-1 context name mode) + (epa-insert-keys context name mode) (epa-keys-mode)) (make-local-variable 'epa-list-keys-arguments) (setq epa-list-keys-arguments (list name mode protocol)) (goto-char (point-min)) (pop-to-buffer (current-buffer))) -(defun epa-list-keys-1 (context name mode) - (save-restriction - (narrow-to-region (point) (point)) - (let ((inhibit-read-only t) - buffer-read-only - (keys (epg-list-keys context 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-insert-keys (context name mode) + (save-excursion + (save-restriction + (narrow-to-region (point) (point)) + (let ((keys (epg-list-keys context name mode)) + point) + (while keys + (setq point (point)) + (insert " ") + (add-text-properties point (point) + (list 'epa-key (car keys) + 'front-sticky nil + 'rear-nonsticky t + 'start-open t + 'end-open t)) + (widget-create 'epa-key :value (car keys)) + (insert "\n") + (setq keys (cdr keys)))) + (add-text-properties (point-min) (point-max) + (list 'epa-list-keys t + 'front-sticky nil + 'rear-nonsticky t + 'start-open t + 'end-open t))))) (defun epa-marked-keys () (or (save-excursion @@ -336,8 +362,7 @@ If SECRET is non-nil, list secret keys instead of public keys." (buffer-live-p epa-keys-buffer)) (setq epa-keys-buffer (generate-new-buffer "*Keys*"))) (let ((inhibit-read-only t) - buffer-read-only - point) + buffer-read-only) (set-buffer epa-keys-buffer) (erase-buffer) (insert prompt "\n") @@ -356,24 +381,28 @@ If SECRET is non-nil, list secret keys instead of public keys." (insert "\n\n") (if names (while names - (setq point (point)) - (epa-list-keys-1 context (car names) secret) - (goto-char point) - (epa-mark) + (epa-insert-keys context (car names) secret) + (if (get-text-property (point) 'epa-list-keys) + (epa-mark)) (goto-char (point-max)) (setq names (cdr names))) - (epa-list-keys-1 context nil secret)) + (if secret + (progn + (epa-insert-keys context nil secret) + (if (get-text-property (point) 'epa-list-keys) + (epa-mark))) + (epa-insert-keys context nil nil))) (epa-keys-mode) (setq epa-exit-buffer-function #'abort-recursive-edit) (goto-char (point-min)) (pop-to-buffer (current-buffer))) (unwind-protect - (progn - (recursive-edit) - (epa-marked-keys)) - (if (get-buffer-window epa-keys-buffer) - (delete-window (get-buffer-window epa-keys-buffer))) - (kill-buffer epa-keys-buffer)))) + (progn + (recursive-edit) + (epa-marked-keys)) + (if (get-buffer-window epa-keys-buffer) + (delete-window (get-buffer-window epa-keys-buffer))) + (kill-buffer epa-keys-buffer)))) (defun epa-show-key (key) (let* ((primary-sub-key (car (epg-key-sub-key-list key))) @@ -424,10 +453,13 @@ If SECRET is non-nil, list secret keys instead of public keys." (cdr (assq (epg-sub-key-algorithm (car pointer)) epg-pubkey-algorithm-alist)) "\n\tCreated: " - (epg-sub-key-creation-time (car pointer)) + (format-time-string "%Y-%m-%d" + (epg-sub-key-creation-time (car pointer))) (if (epg-sub-key-expiration-time (car pointer)) - (format "\n\tExpires: %s" (epg-sub-key-expiration-time - (car pointer))) + (format "\n\tExpires: %s" + (format-time-string "%Y-%m-%d" + (epg-sub-key-expiration-time + (car pointer)))) "") "\n\tCapabilities: " (mapconcat #'symbol-name @@ -464,12 +496,46 @@ If ARG is non-nil, mark the current line." (interactive "P") (epa-mark (not arg))) +(defun epa-toggle-mark () + "Toggle the mark the current line." + (interactive) + (epa-mark (eq (char-after (save-excursion (beginning-of-line) (point))) ?*))) + (defun epa-exit-buffer () "Exit the current buffer. `epa-exit-buffer-function' is called if it is set." (interactive) (funcall epa-exit-buffer-function)) +(defun epa-display-verify-result (verify-result) + (if epa-popup-info-window + (progn + (unless epa-info-buffer + (setq epa-info-buffer (generate-new-buffer "*Info*"))) + (save-excursion + (set-buffer epa-info-buffer) + (let ((inhibit-read-only t) + buffer-read-only) + (erase-buffer) + (insert (epg-verify-result-to-string verify-result))) + (epa-info-mode)) + (pop-to-buffer epa-info-buffer) + (if (> (window-height) epa-info-window-height) + (shrink-window (- (window-height) epa-info-window-height))) + (goto-char (point-min))) + (message "%s" (epg-verify-result-to-string verify-result)))) + +(defun epa-info-mode () + "Major mode for `epa-info-buffer'." + (kill-all-local-variables) + (buffer-disable-undo) + (setq major-mode 'epa-info-mode + mode-name "Info" + truncate-lines t + buffer-read-only t) + (use-local-map epa-info-mode-map) + (run-hooks 'epa-info-mode-hook)) + ;;;###autoload (defun epa-decrypt-file (file) "Decrypt FILE." @@ -487,9 +553,7 @@ If ARG is non-nil, mark the current line." (epg-decrypt-file context file plain) (message "Decrypting %s...done" (file-name-nondirectory file)) (if (epg-context-result-for context 'verify) - (message "%s" - (epg-verify-result-to-string - (epg-context-result-for context 'verify)))))) + (epa-display-verify-result (epg-context-result-for context 'verify))))) ;;;###autoload (defun epa-verify-file (file) @@ -501,9 +565,8 @@ If ARG is non-nil, mark the current line." (message "Verifying %s..." (file-name-nondirectory file)) (epg-verify-file context file plain) (message "Verifying %s...done" (file-name-nondirectory file)) - (message "%s" - (epg-verify-result-to-string - (epg-context-result-for context 'verify))))) + (if (epg-context-result-for context 'verify) + (epa-display-verify-result (epg-context-result-for context 'verify))))) ;;;###autoload (defun epa-sign-file (file signers mode) @@ -537,7 +600,7 @@ If no one is selected, default secret key is used. " "Encrypt FILE for RECIPIENTS." (interactive (list (expand-file-name (read-file-name "File: ")) - (epa-select-keys (epg-make-context) "Select recipents for encryption. + (epa-select-keys (epg-make-context) "Select recipients for encryption. If no one is selected, symmetric encryption will be performed. "))) (let ((cipher (concat file (if epa-armor ".asc" ".gpg"))) (context (epg-make-context))) @@ -549,11 +612,13 @@ If no one is selected, symmetric encryption will be performed. "))) ;;;###autoload (defun epa-decrypt-region (start end) - "Decrypt the current region between START and END." + "Decrypt the current region between START and END. + +Don't use this command in Lisp programs!" (interactive "r") (save-excursion (let ((context (epg-make-context)) - charset plain coding-system) + plain) (message "Decrypting...") (setq plain (epg-decrypt-string context (buffer-substring start end))) (message "Decrypting...done") @@ -561,19 +626,19 @@ If no one is selected, symmetric encryption will be performed. "))) (goto-char start) (insert (decode-coding-string plain coding-system-for-read)) (if (epg-context-result-for context 'verify) - (message "%s" - (epg-verify-result-to-string - (epg-context-result-for context 'verify))))))) + (epa-display-verify-result (epg-context-result-for context 'verify)))))) ;;;###autoload (defun epa-decrypt-armor-in-region (start end) - "Decrypt OpenPGP armors in the current region between START and END." + "Decrypt OpenPGP armors in the current region between START and END. + +Don't use this command in Lisp programs!" (interactive "r") (save-excursion (save-restriction (narrow-to-region start end) (goto-char start) - (let (armor-start armor-end charset plain coding-system) + (let (armor-start armor-end charset coding-system) (while (re-search-forward "-----BEGIN PGP MESSAGE-----$" nil t) (setq armor-start (match-beginning 0) armor-end (re-search-forward "^-----END PGP MESSAGE-----$" @@ -593,20 +658,23 @@ If no one is selected, symmetric encryption will be performed. "))) ;;;###autoload (defun epa-verify-region (start end) - "Verify the current region between START and END." + "Verify the current region between START and END. + +Don't use this command in Lisp programs!" (interactive "r") (let ((context (epg-make-context))) (epg-verify-string context (encode-coding-string (buffer-substring start end) coding-system-for-write)) - (message "%s" - (epg-verify-result-to-string - (epg-context-result-for context 'verify))))) + (if (epg-context-result-for context 'verify) + (epa-display-verify-result (epg-context-result-for context 'verify))))) ;;;###autoload (defun epa-verify-armor-in-region (start end) - "Verify OpenPGP armors in the current region between START and END." + "Verify OpenPGP armors in the current region between START and END. + +Don't use this command in Lisp programs!" (interactive "r") (save-excursion (save-restriction @@ -633,7 +701,9 @@ If no one is selected, symmetric encryption will be performed. "))) ;;;###autoload (defun epa-sign-region (start end signers mode) - "Sign the current region between START and END by SIGNERS keys selected." + "Sign the current region between START and END by SIGNERS keys selected. + +Don't use this command in Lisp programs!" (interactive (list (region-beginning) (region-end) (epa-select-keys (epg-make-context) "Select keys for signing. @@ -661,10 +731,12 @@ If no one is selected, default secret key is used. " ;;;###autoload (defun epa-encrypt-region (start end recipients) - "Encrypt the current region between START and END for RECIPIENTS." + "Encrypt the current region between START and END for RECIPIENTS. + +Don't use this command in Lisp programs!" (interactive (list (region-beginning) (region-end) - (epa-select-keys (epg-make-context) "Select recipents for encryption. + (epa-select-keys (epg-make-context) "Select recipients for encryption. If no one is selected, symmetric encryption will be performed. "))) (save-excursion (let ((context (epg-make-context))