ndwarshuis
/
org-mode
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'maint'

This commit is contained in:
Nicolas Goaziou 2019-03-10 11:14:52 +01:00
parent 56b7c5ba59 116a58b368
commit e84006ea4e
1 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
lisp/org-agenda.el
View File

@ -7003,7 +7003,8 @@ The optional argument TYPE tells the agenda type."
"\\([ \t]*\\[[a-zA-Z0-9]\\]\\)? *") tb) "\\([ \t]*\\[[a-zA-Z0-9]\\]\\)? *") tb)
(setq tb (substring tb (match-end 0)))) (setq tb (substring tb (match-end 0))))
(setq tb (downcase tb))) (setq tb (downcase tb)))
(cond ((not ta) +1) (cond ((not (or ta tb)) nil)
((not ta) +1)
((not tb) -1) ((not tb) -1)
((string-lessp ta tb) -1) ((string-lessp ta tb) -1)
((string-lessp tb ta) +1)))) ((string-lessp tb ta) +1))))
@ -7012,7 +7013,8 @@ The optional argument TYPE tells the agenda type."
"Compare the string values of the first tags of A and B." "Compare the string values of the first tags of A and B."
(let ((ta (car (last (get-text-property 1 'tags a)))) (let ((ta (car (last (get-text-property 1 'tags a))))
(tb (car (last (get-text-property 1 'tags b))))) (tb (car (last (get-text-property 1 'tags b)))))
(cond ((not ta) +1) (cond ((not (or ta tb)) nil)
((not ta) +1)
((not tb) -1) ((not tb) -1)
((string-lessp ta tb) -1) ((string-lessp ta tb) -1)
((string-lessp tb ta) +1)))) ((string-lessp tb ta) +1))))