[Emacs-diffs] emacs/lisp ChangeLog epa.el

[Daiki Ueno]

CVSROOT:        /sources/emacs
Module name:    emacs
Changes by:     Daiki Ueno <ueno>       08/12/03 06:16:24

Modified files:
        lisp           : ChangeLog epa.el 

Log message:
        (epa--show-key): Use past tense of "expire" if the key
        has already been expired.  Thanks to Peter BARABAS.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/emacs/lisp/ChangeLog?cvsroot=emacs&r1=1.14904&r2=1.14905
http://cvs.savannah.gnu.org/viewcvs/emacs/lisp/epa.el?cvsroot=emacs&r1=1.13&r2=1.14

Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/emacs/emacs/lisp/ChangeLog,v
retrieving revision 1.14904
retrieving revision 1.14905
diff -u -b -r1.14904 -r1.14905
--- ChangeLog   3 Dec 2008 05:48:14 -0000       1.14904
+++ ChangeLog   3 Dec 2008 06:16:18 -0000       1.14905
@@ -1,3 +1,8 @@
+2008-12-03  Daiki Ueno  <address@hidden>
+
+       * 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  <address@hidden>
 
        * align.el:

Index: epa.el
===================================================================
RCS file: /sources/emacs/emacs/lisp/epa.el,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -b -r1.13 -r1.14
--- epa.el      26 Aug 2008 03:11:45 -0000      1.13
+++ epa.el      3 Dec 2008 06:16:24 -0000       1.14
@@ -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