summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBastien Guerry <bzg@altern.org>2014-06-15 08:37:09 (GMT)
committer Bastien Guerry <bzg@altern.org>2014-06-15 08:37:09 (GMT)
commite9660703965423f0757b3ea7b21a03c096bb81e3 (patch)
treeacf6750b4445a69af031fd958fdb88fa6243004f
parent03dfc23505cd8b9de902454fa0857ff3dbaa6cb8 (diff)
parente26e47c8a10d6be3e27524d2e42669b7b3004a82 (diff)
downloadorg-mode-e9660703965423f0757b3ea7b21a03c096bb81e3.zip
org-mode-e9660703965423f0757b3ea7b21a03c096bb81e3.tar.gz
Merge branch 'maint'
-rw-r--r--lisp/org-agenda.el2
1 files changed, 1 insertions, 1 deletions
diff --git a/lisp/org-agenda.el b/lisp/org-agenda.el
index 2d1bafe..d7e5841 100644
--- a/lisp/org-agenda.el
+++ b/lisp/org-agenda.el
@@ -7030,7 +7030,7 @@ their type."
(org-cmp-ts a b "deadline")))
(deadline-down (if deadline-up (- deadline-up) nil))
(tsia-up (and (org-em 'tsia-up 'tsia-down ss)
- (org-cmp-ts a b "iatimestamp_ia")))
+ (org-cmp-ts a b "timestamp_ia")))
(tsia-down (if tsia-up (- tsia-up) nil))
(ts-up (and (org-em 'ts-up 'ts-down ss)
(org-cmp-ts a b "timestamp")))