X-Git-Url: http://git.chise.org/gitweb/?a=blobdiff_plain;f=epa.el;h=cb0cb3bcf7478ef7d4eecba3f2a7de6f5f3e4113;hb=9c4b50c1650d0f1c9d0c6189d721de83d57d8ce6;hp=33e9991a54a9effa8fa685f85fedd82cd5e42af2;hpb=5603a97813a49c0f5b527144118d1c6f1d88bd78;p=elisp%2Fepg.git diff --git a/epa.el b/epa.el index 33e9991..cb0cb3b 100644 --- a/epa.el +++ b/epa.el @@ -42,7 +42,7 @@ :type 'boolean :group 'epa) -(defcustom epa-popup-info-window t +(defcustom epa-popup-info-window nil "If non-nil, status information from epa commands is displayed on the separate window." :type 'boolean @@ -187,6 +187,16 @@ the separate window." (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 @@ -227,35 +237,6 @@ the separate window." (epg-sub-key-id (car (epg-key-sub-key-list (widget-get widget :value)))))) -(defun epa--temp-buffer-show-function (buffer) - (save-selected-window - (let ((window (or (get-buffer-window epa-info-buffer-name) - (progn - (select-window (get-largest-window)) - (split-window-vertically))))) - (set-window-buffer window buffer) - (if window - (select-window window)) - (unless (pos-visible-in-window-p (point-max)) - (enlarge-window (- epa-info-window-height (window-height)))) - (let ((height (window-height))) - (if (> height epa-info-window-height) - (shrink-window (- height epa-info-window-height))) - (set-window-start window (point-min)))))) - -(defun epa-display-verify-result (verify-result) - (if epa-popup-info-window - (let ((temp-buffer-show-function #'epa--temp-buffer-show-function)) - (unless epa-info-buffer - (setq epa-info-buffer (generate-new-buffer "*Info*")) - (with-current-buffer epa-info-buffer - (setq buffer-read-only t))) - (with-output-to-temp-buffer epa-info-buffer - (save-excursion - (set-buffer standard-output) - (insert (epg-verify-result-to-string verify-result))))) - (message "%s" (epg-verify-result-to-string verify-result)))) - (defun epa-keys-mode () "Major mode for `epa-list-keys'." (kill-all-local-variables) @@ -275,11 +256,6 @@ the separate window." (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) @@ -386,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") @@ -406,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-insert-keys context (car names) secret) - (goto-char point) - (epa-mark) + (if (get-text-property (point) 'epa-list-keys) + (epa-mark)) (goto-char (point-max)) (setq names (cdr names))) - (epa-insert-keys 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))) @@ -474,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 @@ -514,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." @@ -584,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))) @@ -720,7 +736,7 @@ If no one is selected, default secret key is used. " 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))