X-Git-Url: http://git.chise.org/gitweb/?a=blobdiff_plain;f=epa.el;h=7596176fb8bf9ec9f4c12ccec50ce45a58b83375;hb=c447878abb1cef760e440afa698f79a4d3c1b272;hp=b9eb487199d561068c283b5a75c913d218b4fb94;hpb=d00ee5e0ec545a77b645d8faaf6961deb7073346;p=elisp%2Fepg.git

diff --git a/epa.el b/epa.el
index b9eb487..7596176 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)
@@ -384,6 +401,12 @@ If SECRET is non-nil, list secret keys instead of public keys."
 	    (delete-window (get-buffer-window epa-keys-buffer)))
 	(kill-buffer epa-keys-buffer))))
 
+(defun epa--format-seconds (seconds)
+  (let ((number-seconds (string-to-number (concat seconds ".0"))))
+    (format-time-string "%Y-%m-%d"
+			(cons (floor (/ number-seconds 65536))
+			      (floor (mod number-seconds 65536))))))
+
 (defun epa-show-key (key)
   (let* ((primary-sub-key (car (epg-key-sub-key-list key)))
 	 (entry (assoc (epg-sub-key-id primary-sub-key)
@@ -433,10 +456,11 @@ 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))
+	      (epa--format-seconds (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"
+			  (epa--format-seconds (epg-sub-key-expiration-time
+						(car pointer))))
 		"")
 	      "\n\tCapabilities: "
 	      (mapconcat #'symbol-name
@@ -479,6 +503,35 @@ If ARG is non-nil, mark the current line."
   (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."
@@ -496,9 +549,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)
@@ -510,9 +561,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)
@@ -572,9 +622,7 @@ Don't use this command in Lisp programs!"
       (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)
@@ -615,9 +663,8 @@ Don't use this command in Lisp programs!"
 		       (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)