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 2017-01-04 23:30:11 +01:00
parent d82d309095 8318957da5
commit 774ce8a50e
1 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
lisp/org-agenda.el
View File

@ -7566,8 +7566,11 @@ E looks like \"+<2:25\"."
(defun org-agenda-compare-effort (op value)
"Compare the effort of the current line with VALUE, using OP.
If the line does not have an effort defined, return nil."
(let ((eff (org-get-at-eol 'effort-minutes 1)))
(funcall op (or eff (if org-sort-agenda-noeffort-is-high 32767 -1))
;; `effort-minutes' property cannot be extracted directly from
;; current line but is stored as a property in `txt'.
(let ((effort (get-text-property 0 'effort-minutes (org-get-at-bol 'txt))))
(funcall op
(or effort (if org-sort-agenda-noeffort-is-high 32767 -1))
value)))
(defun org-agenda-filter-expand-tags (filter &optional no-operator)