Merge branch 'maint'

This commit is contained in:
Bastien Guerry 2014-01-03 16:04:06 +01:00
commit d97c050720
1 changed files with 1 additions and 1 deletions

View File

@ -7005,7 +7005,7 @@ 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 9901 -1))
(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) ""))