jiri/org-ql
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Add: Priority selector

Browse source
This commit is contained in:
Adam Porter 2018-01-06 04:08:54 -06:00
parent 94e27fec8a
commit 889a50a3d1
1 changed files with 38 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

38
org-agenda-ng.el
View file

@ -85,6 +85,7 @@ NONE-PREDS."
(org-agenda-ng--fmap ((category #'org-agenda-ng--category-p) (org-agenda-ng--fmap ((category #'org-agenda-ng--category-p)
(date #'org-agenda-ng--date-p) (date #'org-agenda-ng--date-p)
(habit #'org-agenda-ng--habit-p) (habit #'org-agenda-ng--habit-p)
(priority #'org-agenda-ng--priority-p)
(todo #'org-agenda-ng--todo-p) (todo #'org-agenda-ng--todo-p)
(tags #'org-agenda-ng--tags-p)) (tags #'org-agenda-ng--tags-p))
(org-with-wide-buffer (org-with-wide-buffer
@ -364,5 +365,42 @@ like one returned by `date-to-day'."
(error "Unknown date-element type: %s" (org-element-property :type date-element))))) (error "Unknown date-element type: %s" (org-element-property :type date-element)))))
(otherwise (error "COMPARATOR (%s) must be a function, and DATE (%s) must be a string" comparator target-date))))) (otherwise (error "COMPARATOR (%s) must be a function, and DATE (%s) must be a string" comparator target-date)))))
(defmacro org-agenda-ng--priority-p (&optional comparator-or-priority priority)
"Return non-nil if current heading has a certain priority.
COMPARATOR-OR-PRIORITY should be either a comparator function,
like `<=', or a priority string, like \"A\" (in which case (\` =)
'will be the comparator). If COMPARATOR-OR-PRIORITY is a
comparator, PRIORITY should be a priority string."
(let* (comparator)
(cond ((null priority)
;; No comparator given: compare only given priority with =
(setq priority comparator-or-priority
comparator '=))
(t
;; Both comparator and priority given
(setq comparator comparator-or-priority)))
(setq comparator (cl-case comparator
;; Invert comparator because higher priority means lower number
(< '>)
(> '<)
(<= '>=)
(>= '<=)
(= '=)
(otherwise (user-error "Invalid comparator: %s" comparator))))
(setq priority (* 1000 (- org-lowest-priority (string-to-char priority))))
`(when-let ((item-priority (save-excursion
(save-match-data
;; FIXME: Is the save-match-data above necessary?
(when (and (looking-at org-heading-regexp)
(save-match-data
(string-match org-priority-regexp (match-string 0))))
;; TODO: Items with no priority
;; should not be the same as B
;; priority. That's not very
;; useful IMO. Better to do it
;; like in org-super-agenda.
(org-get-priority (match-string 0)))))))
(funcall ',comparator ,priority item-priority))))
(defun org-agenda-ng--habit-p () (defun org-agenda-ng--habit-p ()
(org-is-habit-p)) (org-is-habit-p))