From 35396182b465bd67c72d776709eee5e0041d96c7 Mon Sep 17 00:00:00 2001 From: memeplex Date: Sat, 9 Mar 2019 17:49:52 -0300 Subject: [PATCH] Compare nil-nil as nil so as not to change lexicographic order * lisp/org-agenda.el (org-cmp-alpha/tag): don't favor a particular ordering when both lhs and rhs are nil. --- lisp/org-agenda.el | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/lisp/org-agenda.el b/lisp/org-agenda.el index 13bbae966..c9bea4465 100644 --- a/lisp/org-agenda.el +++ b/lisp/org-agenda.el @@ -7003,7 +7003,8 @@ The optional argument TYPE tells the agenda type." "\\([ \t]*\\[[a-zA-Z0-9]\\]\\)? *") tb) (setq tb (substring tb (match-end 0)))) (setq tb (downcase tb))) - (cond ((not ta) +1) + (cond ((not (or ta tb)) nil) + ((not ta) +1) ((not tb) -1) ((string-lessp ta tb) -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." (let ((ta (car (last (get-text-property 1 'tags a)))) (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) ((string-lessp ta tb) -1) ((string-lessp tb ta) +1)))) -- 2.21.0