From 4b85f7907fe91e3594191ef17e84cebd10073b74 Mon Sep 17 00:00:00 2001 From: David Maus Date: Sat, 26 Dec 2009 22:14:34 +0100 Subject: [PATCH 1/2] Use `org-time-string-to-time' to convert timestamp to time object. --- contrib/lisp/org-expiry.el | 5 ++--- 1 files changed, 2 insertions(+), 3 deletions(-) diff --git a/contrib/lisp/org-expiry.el b/contrib/lisp/org-expiry.el index 2a6998a..41fb91c 100644 --- a/contrib/lisp/org-expiry.el +++ b/contrib/lisp/org-expiry.el @@ -286,8 +286,7 @@ update the date." d-time d-hour) (when (or (null d) arg) ;; update if no date or non-nil prefix argument - ;; FIXME Use `org-time-string-to-time' - (setq d-time (if d (apply 'encode-time (org-parse-time-string d)) + (setq d-time (if d (org-time-string-to-time d) (current-time))) (setq d-hour (format-time-string "%H:%M" d-time)) (save-excursion @@ -306,7 +305,7 @@ and insert today's date." (interactive "P") (let* ((d (org-entry-get (point) org-expiry-expiry-property-name)) d-time d-hour) - (setq d-time (if d (apply 'encode-time (org-parse-time-string d)) + (setq d-time (if d (org-time-string-to-time d) (current-time))) (setq d-hour (format-time-string "%H:%M" d-time)) (save-excursion -- 1.6.5