Merge branch 'maint'

2020-11-17 00:52:52 -05:00 · 2020-11-17 00:52:52 -05:00 · c0588fc42d
parent 8bade78ce6 104d92199e
commit c0588fc42d
1 changed files with 4 additions and 1 deletions
--- a/lisp/org-agenda.el
+++ b/lisp/org-agenda.el
@ -8620,7 +8620,10 @@ log items, nothing else."
 When called with a prefix argument, include all archive files as well."
  (interactive "P")
  (setq org-agenda-archives-mode
-	(if with-files t (if org-agenda-archives-mode nil 'trees)))
+	(cond ((and with-files (eq org-agenda-archives-mode t)) nil)
+	      (with-files t)
+	      (org-agenda-archives-mode nil)
+	      (t 'trees)))
  (org-agenda-set-mode-name)
  (org-agenda-redo)
  (message