Browse Source

Merge branch 'maint'

Bastien Guerry 10 years ago
parent
commit
2ce78ef45b
1 changed files with 3 additions and 3 deletions
  1. 3 3
      lisp/org-agenda.el

+ 3 - 3
lisp/org-agenda.el

@@ -6988,16 +6988,16 @@ The optional argument TYPE tells the agenda type."
     (cond ((< ta tb) -1)
     (cond ((< ta tb) -1)
 	  ((< tb ta) +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.
   "Compare the timestamps values of entries A and B.
 When TYPE is \"scheduled\", \"deadline\", \"timestamp\" or
 When TYPE is \"scheduled\", \"deadline\", \"timestamp\" or
 \"timestamp_ia\", compare within each of these type.  When TYPE
 \"timestamp_ia\", compare within each of these type.  When TYPE
 is the empty string, compare all timestamps without respect of
 is the empty string, compare all timestamps without respect of
 their type."
 their type."
   (let* ((def (if org-sort-agenda-notime-is-late most-positive-fixnum -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) ""))
+	 (ta (or (and (string-match type (or (get-text-property 1 type a) ""))
 		      (get-text-property 1 'ts-date a)) def))
 		      (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)))
 		      (get-text-property 1 'ts-date b)) def)))
     (cond ((< ta tb) -1)
     (cond ((< ta tb) -1)
 	  ((< tb ta) +1))))
 	  ((< tb ta) +1))))