From: ueno <ueno>
Date: Fri, 5 Jan 2007 23:28:17 +0000 (+0000)
Subject: * epg.el (epg--make-sub-key-1): Don't set expiration-time if it is "0".
X-Git-Tag: epg-0_0_10~16
X-Git-Url: http://git.chise.org/gitweb/?a=commitdiff_plain;ds=sidebyside;h=4b8ef64d89c205fc422fdeb0de4a779611c431f7;hp=52922bf3f8d3b7f4fee3359b18a5c03d2fac71c2;p=elisp%2Fepg.git

* epg.el (epg--make-sub-key-1): Don't set expiration-time if it is "0".
---

diff --git a/ChangeLog b/ChangeLog
index be6aa66..9607b50 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -6,6 +6,7 @@
 
 	* epg.el (epg--status-VALIDSIG): Don't set expiration-time if it
 	is "0".
+	(epg--make-sub-key-1): Ditto.
 
 	* pgg-epg.el (pgg-epg-encrypt-region): Ask a user whether to skip a
 	recipient whose public key is not available.
diff --git a/epg.el b/epg.el
index 243292c..366e4b6 100644
--- a/epg.el
+++ b/epg.el
@@ -1672,7 +1672,8 @@ This function is for internal use only."
    (string-to-number (aref line 2))
    (aref line 4)
    (epg--time-from-seconds (aref line 5))
-   (epg--time-from-seconds (aref line 6))))
+   (unless (equal (aref line 6) "0")
+     (epg--time-from-seconds (aref line 6)))))
 
 ;;;###autoload
 (defun epg-list-keys (context &optional name mode)