diff options
| author | Kyle Meyer <kyle@kyleam.com> | 2020-05-20 23:00:40 -0400 |
|---|---|---|
| committer | Kyle Meyer <kyle@kyleam.com> | 2020-05-20 23:00:40 -0400 |
| commit | bfc4569ae326a40ac77ea89dffdbfdfaabc6ec0d (patch) | |
| tree | 879392c67cf9ff07d7899a9db106512ffde97fbb | |
| parent | 962b8e765c2a73833f1d8d1da352f60ffb5e32f7 (diff) | |
| parent | 5e2490bdf29a1eeff91b631425c38309cf368690 (diff) | |
| download | org-mode-bfc4569ae326a40ac77ea89dffdbfdfaabc6ec0d.tar.gz | |
Merge branch 'maint'
| -rw-r--r-- | lisp/org-agenda.el | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/lisp/org-agenda.el b/lisp/org-agenda.el index 9c73d0d..8ed5e40 100644 --- a/lisp/org-agenda.el +++ b/lisp/org-agenda.el @@ -4082,8 +4082,10 @@ continue from there." (when (or (save-excursion (goto-char p) (looking-at comment-start-skip)) (and org-agenda-skip-archived-trees (not org-agenda-archives-mode) - (get-text-property p :org-archived) - (org-end-of-subtree t)) + (or (and (get-text-property p :org-archived) + (org-end-of-subtree t)) + (and (member org-archive-tag org-file-tags) + (goto-char (point-max))))) (and org-agenda-skip-comment-trees (get-text-property p :org-comment) (org-end-of-subtree t)) |