From de71f03d2a6ea36a1edfa1c43fe9b6a28fc4d47b Mon Sep 17 00:00:00 2001 From: Alan Schmitt Date: Mon, 14 Apr 2014 14:03:45 +0200 Subject: [PATCH] Org-expiry: make code and doc consistent * contrib/lisp/org-expiry.el (org-expiry-expired-p): make code and doc string consistent. --- contrib/lisp/org-expiry.el | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/contrib/lisp/org-expiry.el b/contrib/lisp/org-expiry.el index d58043f43..1506c3bc0 100644 --- a/contrib/lisp/org-expiry.el +++ b/contrib/lisp/org-expiry.el @@ -218,11 +218,12 @@ Return nil if the entry is not expired. Otherwise return the amount of time between today and the expiry date. If there is no creation date, use `org-expiry-created-date'. -If there is no expiry date, use `org-expiry-expiry-date'." +If there is no expiry date, use `org-expiry-wait'." (let* ((ex-prop org-expiry-expiry-property-name) (cr-prop org-expiry-created-property-name) (ct (current-time)) - (cr (org-read-date nil t (or (org-entry-get (point) cr-prop t) "+0d"))) + (cr (org-read-date nil t (or (org-entry-get (point) cr-prop t) + org-expiry-created-date))) (ex-field (or (org-entry-get (point) ex-prop t) org-expiry-wait)) (ex (if (string-match "^[ \t]?[+-]" ex-field) (time-add cr (time-subtract (org-read-date nil t ex-field) ct))