diff options
author | Bastien Guerry <bzg@altern.org> | 2014-06-15 10:43:47 +0200 |
---|---|---|
committer | Bastien Guerry <bzg@altern.org> | 2014-06-15 10:43:47 +0200 |
commit | e30c6cc44bba996b1153a5ba91ad69d846592e2b (patch) | |
tree | a6d43fc76849301e06b46a34933fab708217eda2 | |
parent | 49d59859f04a5c8ba449ada62c3c9808bb6234de (diff) | |
parent | af8ee5fcf2c0e2acf0e7f60b22ffc05b384ebb09 (diff) | |
download | org-mode-e30c6cc44bba996b1153a5ba91ad69d846592e2b.tar.gz |
Merge branch 'maint'
-rw-r--r-- | lisp/org-agenda.el | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/lisp/org-agenda.el b/lisp/org-agenda.el index d7e5841..55fc1d3 100644 --- a/lisp/org-agenda.el +++ b/lisp/org-agenda.el @@ -7001,10 +7001,12 @@ When TYPE is \"scheduled\", \"deadline\", \"timestamp\" or 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) "")) - (get-text-property 1 'ts-date a)) def)) - (tb (or (and (string-match type (or (get-text-property 1 type b) "")) - (get-text-property 1 'ts-date b)) def))) + (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) "")) + (get-text-property 1 'ts-date b)) + def))) (cond ((< ta tb) -1) ((< tb ta) +1)))) |