diff options
author | Bastien Guerry <bzg@altern.org> | 2014-05-22 21:15:44 +0200 |
---|---|---|
committer | Bastien Guerry <bzg@altern.org> | 2014-05-22 21:15:44 +0200 |
commit | 2ce78ef45bee49f0e488334a3a1f8cf574f31add (patch) | |
tree | 27e608485891394b1ba596cd7a5c786a8856055c | |
parent | 365b9dde16f3f0863dbfd09a57a3bbed552a33be (diff) | |
parent | cece23b6646e0d6f275c85957297672d262c8ad3 (diff) | |
download | org-mode-2ce78ef45bee49f0e488334a3a1f8cf574f31add.tar.gz |
Merge branch 'maint'
-rw-r--r-- | lisp/org-agenda.el | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/lisp/org-agenda.el b/lisp/org-agenda.el index f8a3f5b..95c0adb 100644 --- a/lisp/org-agenda.el +++ b/lisp/org-agenda.el @@ -6988,16 +6988,16 @@ The optional argument TYPE tells the agenda type." (cond ((< ta tb) -1) ((< tb ta) +1)))) -(defsubst org-cmp-ts (a b &optional type) +(defsubst org-cmp-ts (a b type) "Compare the timestamps values of entries A and B. When TYPE is \"scheduled\", \"deadline\", \"timestamp\" or \"timestamp_ia\", compare within each of these type. When TYPE is the empty string, compare all timestamps without respect of their type." (let* ((def (if org-sort-agenda-notime-is-late most-positive-fixnum -1)) - (ta (or (and (string-match type (or (get-text-property 1 'type a) "")) + (ta (or (and (string-match type (or (get-text-property 1 type a) "")) (get-text-property 1 'ts-date a)) def)) - (tb (or (and (string-match type (or (get-text-property 1 'type b) "")) + (tb (or (and (string-match type (or (get-text-property 1 type b) "")) (get-text-property 1 'ts-date b)) def))) (cond ((< ta tb) -1) ((< tb ta) +1)))) |