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

diff --git a/epa.el b/epa.el
index 762b172..7596176 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-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)
@@ -425,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)
@@ -474,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
@@ -520,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."