Merge branch 'maint'

This commit is contained in:
Bastien Guerry 2014-06-15 10:37:09 +02:00
commit e966070396
1 changed files with 1 additions and 1 deletions

View File

@ -7030,7 +7030,7 @@ their type."
(org-cmp-ts a b "deadline"))) (org-cmp-ts a b "deadline")))
(deadline-down (if deadline-up (- deadline-up) nil)) (deadline-down (if deadline-up (- deadline-up) nil))
(tsia-up (and (org-em 'tsia-up 'tsia-down ss) (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)) (tsia-down (if tsia-up (- tsia-up) nil))
(ts-up (and (org-em 'ts-up 'ts-down ss) (ts-up (and (org-em 'ts-up 'ts-down ss)
(org-cmp-ts a b "timestamp"))) (org-cmp-ts a b "timestamp")))