浏览代码

Org-expiry: make code and doc consistent

* contrib/lisp/org-expiry.el (org-expiry-expired-p): make code and doc
string consistent.
Alan Schmitt 11 年之前
父节点
当前提交
de71f03d2a
共有 1 个文件被更改,包括 3 次插入2 次删除
  1. 3 2
      contrib/lisp/org-expiry.el

+ 3 - 2
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.
 amount of time between today and the expiry date.
 
 
 If there is no creation date, use `org-expiry-created-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)
   (let* ((ex-prop org-expiry-expiry-property-name)
 	 (cr-prop org-expiry-created-property-name)
 	 (cr-prop org-expiry-created-property-name)
 	 (ct (current-time))
 	 (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-field (or (org-entry-get (point) ex-prop t) org-expiry-wait))
 	 (ex (if (string-match "^[ \t]?[+-]" ex-field)
 	 (ex (if (string-match "^[ \t]?[+-]" ex-field)
 		 (time-add cr (time-subtract (org-read-date nil t ex-field) ct))
 		 (time-add cr (time-subtract (org-read-date nil t ex-field) ct))