summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBastien Guerry <bzg@altern.org>2013-02-07 18:40:39 (GMT)
committer Bastien Guerry <bzg@altern.org>2013-02-07 18:40:39 (GMT)
commit05acaa9de43cb59ab91665a5f8f3bef14249781f (patch)
tree8e810702160701c2bf4e71bd18a8e15dd058a5b3
parent25a481d8ae25cad3e94fb5f3aa31b911f7d31b85 (diff)
downloadorg-mode-05acaa9de43cb59ab91665a5f8f3bef14249781f.zip
org-mode-05acaa9de43cb59ab91665a5f8f3bef14249781f.tar.gz
org-agenda.el (org-agenda-get-timestamps): Use nil as `ts-date' for diary sexpressions
* org-agenda.el (org-agenda-get-todos) (org-agenda-get-timestamps): Use nil as `ts-date' for diary sexpressions.
-rw-r--r--lisp/org-agenda.el7
1 files changed, 3 insertions, 4 deletions
diff --git a/lisp/org-agenda.el b/lisp/org-agenda.el
index 54dbeea..fab676e 100644
--- a/lisp/org-agenda.el
+++ b/lisp/org-agenda.el
@@ -5485,9 +5485,7 @@ the documentation of `org-diary'."
(org-entry-get (point) "TIMESTAMP_IA"))
ts-date-type ""))
(t (setq ts-date-type "")))
- (when ts (or (ignore-errors (org-time-string-to-absolute ts))
- ;; We skip diary sexp because `date' is not bound
- (time-to-days nil)))))
+ (when ts (ignore-errors (org-time-string-to-absolute ts)))))
category-pos (get-text-property (point) 'org-category-position)
txt (org-trim
(buffer-substring (match-beginning 2) (match-end 0)))
@@ -5705,7 +5703,8 @@ Do we have a reason to ignore this TODO entry because it has a time stamp?
'org-marker marker 'org-hd-marker hdmarker
'org-category category 'date date
'level level
- 'ts-date (org-time-string-to-absolute timestr)
+ 'ts-date
+ (ignore-errors (org-time-string-to-absolute timestr))
'org-category-position category-pos
'todo-state todo-state
'warntime warntime