Merge branch 'maint'

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) ""))
+	 (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))
-	 (tb (or (and (string-match type (or (get-text-property 1 type b) ""))
+		 def))
-		      (get-text-property 1 'ts-date b)) 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))))