init.el

@@ -1179,13 +1179,13 @@
                        ""
                        ((org-agenda-entry-types '(:timestamp :sexp :scheduled :deadline))
                         (org-deadline-warning-days 0)))
+                      (tags-todo "TODO={CONT\\|ATTN}-HOLD-TIMESTAMP>=\"<today>\"-SCHEDULED<>\"\"-NOT_BEFORE>=\"<today>\""
+                                 ((org-agenda-overriding-header "Things to do next (Task shortlist and WIP, TODO ∈ {CONT,ATTN}, not scheduled)")))
                       (db/org-agenda-list-deadlines
                        ""
                        ((org-agenda-overriding-header "Deadlines")
                         (org-agenda-sorting-strategy '(deadline-up priority-down))
                         (org-deadline-warning-days 30)))
-                      (tags-todo "TODO={CONT\\|ATTN}-HOLD-TIMESTAMP>=\"<today>\"-SCHEDULED<>\"\"-NOT_BEFORE>=\"<today>\""
-                                 ((org-agenda-overriding-header "Things to do next (Task shortlist and WIP, TODO ∈ {CONT,ATTN}, not scheduled)")))
                       (tags-todo "TODO<>\"CONT\"-HOLD-SOMEWHEN-DATE-WAIT-TEMPLATE-SCHEDULED>=\"<today>\"-NOT_BEFORE>=\"<today>\""
                                  ((org-agenda-overriding-header "Task Backlog (not WIP, not scheduled now or in the future)")
                                   (org-tags-match-list-sublevels t)))))
@@ -1229,14 +1229,14 @@
                       ))
 
                 ("U" "Unsupervised (Waiting, Missed Appointments, Hold)"
-                     ((tags "WAIT-SOMEWHEN-SCHEDULED>=\"<today>\"-NOT_BEFORE>=\"<today>\""
+                     ((tags-todo "WAIT-HOLD-SOMEWHEN-SCHEDULED>=\"<today>\"-NOT_BEFORE>=\"<today>\""
                                  ((org-agenda-overriding-header "Waiting For List")))
                       (tags-todo "DATE-TIMESTAMP>=\"<today>\""
                                  ((org-agenda-overriding-header "Missed appointments (DATEs with timestamp in the past)")))
                       (tags "REFILE"
                             ((org-agenda-files (list db/org-default-refile-file))
                              (org-agenda-overriding-header "Things to refile (make it empty!)")))
-                      (tags "HOLD-SOMEWHEN-SCHEDULED>=\"<today>\"-NOT_BEFORE>=\"<today>\""
+                      (tags "HOLD-TODO=\"DONE\"-TODO=\"CANC\"-TODO=\"MRGD\""
                             ((org-agenda-overriding-header "Tasks on Hold")))))
 
 
@@ -2356,15 +2356,10 @@ The password is assumed to be stored at the PASSWORD property."
 
 (defun db/helm-shortcuts (arg)
   "Open helm completion on common locations.
-
-With universal argument ARG, inhibit display of files in
-`db/important-document-path’.  This might be helpful when loading
-is too slow (in this case, `db/important-document-path' should
-eventuelly be set to nil, however)."
-  (interactive "P")
-  (eval-when-compile
-    (require 'helm-bookmark)
-    (require 'helm-for-files))          ; for helm-source-recentf
+With given ARG, display files in `db/important-document-path’."
+  (interactive "p")
+  (require 'helm-bookmark)
+  (require 'helm-for-files)             ; for helm-source-recentf
   (helm :sources (list
                   (helm-make-source "Frequently Used" 'helm-source-sync
                     :candidates (mapcar #'(lambda (entry)
@@ -2381,7 +2376,7 @@ eventuelly be set to nil, however)."
 
                   ;; if prefix arg is given, extract files from
                   ;; `db/important-documents-path’ and list them as well
-                  (when (and (not arg)
+                  (when (and (= arg 4)
                              (file-directory-p db/important-documents-path))
                     (let ((search-path (expand-file-name db/important-documents-path)))
                       (helm-make-source "Important files" 'helm-source-sync