# HG changeset patch
# User Daiki Ueno <ueno@unixuser.org>
# Date 1228284978 0
# Node ID be17c10d73810e9bf08d6c2d3b9c673bdb139b78
# Parent  8c996aad13cc0379efa2ce7790b678132f5ddc43
(epa--show-key): Use past tense of "expire" if the key
has already been expired.  Thanks to Peter BARABAS.

diff -r 8c996aad13cc -r be17c10d7381 lisp/ChangeLog
--- a/lisp/ChangeLog	Wed Dec 03 05:54:27 2008 +0000
+++ b/lisp/ChangeLog	Wed Dec 03 06:16:18 2008 +0000
@@ -1,3 +1,8 @@
+2008-12-03  Daiki Ueno  <ueno@unixuser.org>
+
+	* epa.el (epa--show-key): Use past tense of "expire" if the key
+	has already been expired.  Thanks to Peter BARABAS.
+
 2008-12-03  Lute Kamstra  <lute@gnu.org>
 
 	* align.el:
diff -r 8c996aad13cc -r be17c10d7381 lisp/epa.el
--- a/lisp/epa.el	Wed Dec 03 05:54:27 2008 +0000
+++ b/lisp/epa.el	Wed Dec 03 06:16:18 2008 +0000
@@ -586,7 +586,11 @@
 				      (epg-sub-key-creation-time (car pointer)))
 		(error "????-??-??"))
 	      (if (epg-sub-key-expiration-time (car pointer))
-		  (format "\n\tExpires: %s"
+		  (format (if (time-less-p (current-time)
+					   (epg-sub-key-expiration-time
+					    (car pointer)))
+			      "\n\tExpires: %s"
+			    "\n\tExpired: %s")
 			  (condition-case nil
 			      (format-time-string "%Y-%m-%d"
 						  (epg-sub-key-expiration-time