Merge branch 't/patch157'

This commit is contained in:
John Wiegley 2010-07-28 02:26:57 -04:00
commit d91ce1490d

View file

@ -5315,8 +5315,9 @@ HH:MM."
(alpha-up (and (org-em 'alpha-up 'alpha-down ss) (alpha-up (and (org-em 'alpha-up 'alpha-down ss)
(org-cmp-alpha a b))) (org-cmp-alpha a b)))
(alpha-down (if alpha-up (- alpha-up) nil)) (alpha-down (if alpha-up (- alpha-up) nil))
(need-user-cmp (org-em 'user-defined-up 'user-defined-down ss))
user-defined-up user-defined-down) user-defined-up user-defined-down)
(if (and org-agenda-cmp-user-defined (if (and need-user-cmp org-agenda-cmp-user-defined
(functionp org-agenda-cmp-user-defined)) (functionp org-agenda-cmp-user-defined))
(setq user-defined-up (setq user-defined-up
(funcall org-agenda-cmp-user-defined a b) (funcall org-agenda-cmp-user-defined a b)