Update tags to match structure, splice lists in agendas

Open now on undertakings header, so it needs to be inherited.  Agenda updated
to skip the right levels for undertakings.  Custom agenda lists correctly
spliced in.

diff --git a/config.org b/config.org
index 41436f80f1bb04fa816f52acef3754add3c44279..27f1fee647d6eb3cbe9b0a0f0999eec0e6ffff0c 100644 (file)
--- a/config.org
+++ b/config.org
@@ -291,9 +291,7 @@ Sly really doesn't play well with elodc in the minibuffer, so here are some sett
                      ("email" . ?e)
                      ("errand" . ?r)
                      ("jobpc" . ?j)
-                     ("license" . ?l)
-                     ("open" . ?o))
-      org-tags-exclude-from-inheritance '("open")
+                     ("license" . ?l))
       org-todo-keywords '((sequence "TODO(t)" "WAITING(w@)" "|" "DONE(d)" "BELAYED(b@)" "GIVEN(g@)")
                          (sequence "MEETING(m)" "|" "MET(M)"))
       org-todo-keyword-faces '(("WAITING" :foreground "#e85400" :weight bold)
@@ -329,30 +327,32 @@ Sly really doesn't play well with elodc in the minibuffer, so here are some sett
 ***** Custom Agendas
 #+BEGIN_SRC emacs-lisp
 (defvar *re/org-agenda-inbox*
-  '(tags "inbox" ((org-agenda-overriding-header "\nINBOX:"))))
+  '(tags "inbox" ((org-agenda-overriding-header "INBOX:"))))
 
 (defvar *re/org-agenda-todo*
-  '(tags-todo "-recurring/TODO" ((org-agenda-overriding-header "\nNEXT:"))))
+  '(tags-todo "-recurring/TODO" ((org-agenda-overriding-header "NEXT:"))))
 
 (defvar *re/org-agenda-undertakings*
-  '(tags "open" ((org-agenda-overriding-header "\nUNDERTAKINGS:"))))
+  '(tags "open" ((org-agenda-skip-function
+                 '(org-agenda-skip-entry-if 'notregexp "^\\*\\* "))
+                (org-agenda-overriding-header "UNDERTAKINGS:"))))
 
 (defvar *re/org-agenda-waiting*
-  '(todo "WAITING" ((org-agenda-overriding-header "\nWAITING:"))))
+  '(todo "WAITING" ((org-agenda-overriding-header "WAITING:"))))
 
 (defvar *re/org-agenda-two-week-overview*
   '(agenda "" ((org-agenda-span 14)
               (org-agenda-start-day "+1d")
               (org-agenda-start-on-weekday nil)
-              (org-agenda-overriding-header "\nTWO-WEEK UPCOMING:"))))
+              (org-agenda-overriding-header "TWO-WEEK UPCOMING:"))))
 
 (setq org-agenda-custom-commands `(("f" "Maybe Someday" tags "someday" ((org-agenda-overriding-header "SOMEDAY:")))
-                                  ("i" "Inbox" ,*re/org-agenda-inbox*)
+                                  ("i" "Inbox" ,@*re/org-agenda-inbox*)
                                   ("l" "Licenses" tags "license" ((org-agenda-overriding-header "LICENSES:")))
-                                  ("n" "Next Actions" ,*re/org-agenda-todo*)
+                                  ("n" "Next Actions" ,@*re/org-agenda-todo*)
                                   ("p" "JobPCs" tags "jobpc" ((org-agenda-overriding-header "JOB PCS:")))
-                                  ("u" "Undertakings" ,*re/org-agenda-undertakings*)
-                                  ("w" "Waiting" ,*re/org-agenda-waiting*)
+                                  ("u" "Undertakings" ,@*re/org-agenda-undertakings*)
+                                  ("w" "Waiting" ,@*re/org-agenda-waiting*)
                                   ("o" "Overview" ((agenda "" ((org-agenda-compact-blocks t)))
                                                    ,,*re/org-agenda-inbox*
                                                    ,,*re/org-agenda-todo*