tec/org-mode
tec
/
org-mode
forked from mirrors/org-mode
1
0
Fork 0
Code Pull Requests Releases Activity

org-agenda.el (org-cmp-ts): Avoid error when trying to string-match against nil 

* org-agenda.el (org-cmp-ts): Avoid error when trying to
string-match against nil.

TINYCHANGE
This commit is contained in:
Richard Lawrence 2013-04-20 08:58:29 +02:00 committed by Bastien Guerry
parent 2a192ff6c1
commit 1b0c4cf0f8
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
lisp/org-agenda.el
View File

@ -6984,14 +6984,14 @@ The optional argument TYPE tells the agenda type."
(defsubst org-cmp-ts (a b &optional 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."
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))
(ta (or (and (string-match type (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 (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))))