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

Merge branch 'master' into next

This commit is contained in:
Marco Wahl 2019-10-23 12:17:46 +02:00
parent b158aa452a 28bb1c81fa
commit 4667f04b2d
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
lisp/org-agenda.el
View File

@ -7308,14 +7308,14 @@ subtree."
;;; Agenda commands
(defun org-agenda-check-type (error &rest types)
"Check if agenda buffer is of allowed type.
"Check if agenda buffer or component is of allowed type.
If ERROR is non-nil, throw an error, otherwise just return nil.
Allowed types are `agenda' `todo' `tags' `search'."
(cond ((not org-agenda-type)
(error "No Org agenda currently displayed"))
((memq org-agenda-type types) t)
(error
(error "Not allowed in %s-type agenda buffers" org-agenda-type))
(error "Not allowed in '%s'-type agenda buffer or component" org-agenda-type))
(t nil)))
(defun org-agenda-Quit ()
@ -7561,7 +7561,7 @@ an already existing regexp filter."
"Narrow to entries matching regexp: ")))))
(push flt org-agenda-regexp-filter)
(org-agenda-filter-apply org-agenda-regexp-filter 'regexp))))))
(defvar org-agenda-effort-filter nil)
(defun org-agenda-filter-by-effort (strip-or-accumulate)
"Filter agenda entries by effort.