summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNicolas Goaziou <mail@nicolasgoaziou.fr>2018-05-11 21:49:25 +0200
committerNicolas Goaziou <mail@nicolasgoaziou.fr>2018-05-11 21:49:25 +0200
commit68b376dee0e9b6fb1773dab17d8064bf5c3b6330 (patch)
tree731b667057aa3940a5a655192dcc40f81de218ae
parent4fe6891cdfe816921015ea3d6d32419343b0d053 (diff)
downloadorg-mode-68b376dee0e9b6fb1773dab17d8064bf5c3b6330.tar.gz
org-agenda: Fix "org-agenda: one-armed “if” -> “when”"
* lisp/org-agenda.el (org-tags-view): Re-instate delete `else' part. Reported-by: Bernt Hansen <bernt@norang.ca> <http://lists.gnu.org/r/emacs-orgmode/2018-05/msg00286.html>
-rw-r--r--lisp/org-agenda.el13
1 files changed, 7 insertions, 6 deletions
diff --git a/lisp/org-agenda.el b/lisp/org-agenda.el
index 4f38e2e..657e497 100644
--- a/lisp/org-agenda.el
+++ b/lisp/org-agenda.el
@@ -4751,12 +4751,13 @@ The prefix arg TODO-ONLY limits the search to TODO entries."
(setq match nil))
(catch 'exit
;; TODO: this code is repeated a lot...
- (when org-agenda-sticky
- (setq org-agenda-buffer-name
- (if (stringp match)
- (format "*Org Agenda(%s:%s)*"
- (or org-keys (or (and todo-only "M") "m")) match)
- (format "*Org Agenda(%s)*" (or (and todo-only "M") "m")))))
+ (if org-agenda-sticky
+ (setq org-agenda-buffer-name
+ (if (stringp match)
+ (format "*Org Agenda(%s:%s)*"
+ (or org-keys (or (and todo-only "M") "m")) match)
+ (format "*Org Agenda(%s)*" (or (and todo-only "M") "m"))))
+ (setq matcher (org-make-tags-matcher match)))
;; Prepare agendas (and `org-tag-alist-for-agenda') before
;; expanding tags within `org-make-tags-matcher'
(org-agenda-prepare (concat "TAGS " match))