summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAlan Schmitt <alan.schmitt@polytechnique.org>2014-04-14 14:03:45 +0200
committerAlan Schmitt <alan.schmitt@polytechnique.org>2014-04-14 14:03:45 +0200
commitde71f03d2a6ea36a1edfa1c43fe9b6a28fc4d47b (patch)
treea6740ea5774190c6c5831ccde84f711b9173a7f6
parentee3cf87d4020721dd012e42fa71f1017d39b7bf1 (diff)
downloadorg-mode-de71f03d2a6ea36a1edfa1c43fe9b6a28fc4d47b.tar.gz
Org-expiry: make code and doc consistent
* contrib/lisp/org-expiry.el (org-expiry-expired-p): make code and doc string consistent.
-rw-r--r--contrib/lisp/org-expiry.el5
1 files changed, 3 insertions, 2 deletions
diff --git a/contrib/lisp/org-expiry.el b/contrib/lisp/org-expiry.el
index d58043f..1506c3b 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))