From 5083df782a467420893cc78c82ccce6a36e9c355 Mon Sep 17 00:00:00 2001 From: doolio Date: Mon, 22 May 2023 22:24:27 +0200 Subject: [PATCH] Rename org-gtd-agenda.el to org-gtd-engage.el This renaming aligns it with the name for step 5 of the GTD methodology. Command org-gtd-show-all-next renamed to org-gtd-engage-next as well. Resolves: #165 --- CHANGELOG.org | 4 + doc/org-gtd.org | 8 +- doc/org-gtd.texi | 8 +- org-gtd-archive.el | 2 +- org-gtd-autoloads.el | 38 +++++----- org-gtd-agenda.el => org-gtd-engage.el | 12 ++- org-gtd-organize.el | 2 +- org-gtd-process.el | 2 +- org-gtd-review.el | 2 +- org-gtd.el | 2 +- org-gtd.info | 100 ++++++++++++------------- 11 files changed, 95 insertions(+), 85 deletions(-) rename org-gtd-agenda.el => org-gtd-engage.el (92%) diff --git a/CHANGELOG.org b/CHANGELOG.org index d4291bf..3548a45 100644 --- a/CHANGELOG.org +++ b/CHANGELOG.org @@ -1,3 +1,7 @@ +* Unreleased +** Changed +- Command org-gtd-show-all-next renamed to org-gtd-engage-next +- File org-gtd-agenda.el renamed to org-gtd-engage.el * 3.0.0 ** Functions exist to create your own hooks Make GTD truly a part of your emacs experience. diff --git a/doc/org-gtd.org b/doc/org-gtd.org index e534721..c940eb0 100644 --- a/doc/org-gtd.org +++ b/doc/org-gtd.org @@ -311,7 +311,7 @@ My org-gtd config for 1.x was as follows: (("C-c d c" . org-gtd-capture) ("C-c d a" . org-agenda-list) ("C-c d p" . org-gtd-process-inbox) - ("C-c d n" . org-gtd-show-all-next) + ("C-c d n" . org-gtd-engage-next) ("C-c d s" . org-gtd-show-stuck-projects) :map org-gtd-process-map ("C-c c" . org-gtd-choose))) @@ -357,7 +357,7 @@ And my config for 2.0 is: (("C-c d c" . org-gtd-capture) ("C-c d e" . org-gtd-engage) ("C-c d p" . org-gtd-process-inbox) - ("C-c d n" . org-gtd-show-all-next) + ("C-c d n" . org-gtd-engage-next) ("C-c d s" . org-gtd-show-stuck-projects) :map org-gtd-process-map ("C-c c" . org-gtd-choose))) @@ -523,7 +523,7 @@ If you are a Doom Emacs user, then your configuration may look something like th :desc "Capture" "c" #'org-gtd-capture :desc "Engage" "e" #'org-gtd-engage :desc "Process inbox" "p" #'org-gtd-process-inbox - :desc "Show all next" "n" #'org-gtd-show-all-next + :desc "Show all next" "n" #'org-gtd-engage-next :desc "Stuck projects" "s" #'org-gtd-review-stuck-projects)) (map! :map org-gtd-clarify-map :desc "Organize this item" "C-c c" #'org-gtd-organize)) @@ -676,7 +676,7 @@ Here is an example: You can see a list of all NEXT actions, and scheduled actions, with ~M-x org-gtd-engage~ . -You can call ~org-gtd-show-all-next~ to only see NEXT actions, nothing scheduled. +You can call ~org-gtd-engage-next~ to only see NEXT actions, nothing scheduled. You can use ~org-gtd-oops~ to see all the appointments you missed, and act on them accordingly. diff --git a/doc/org-gtd.texi b/doc/org-gtd.texi index 4dc0901..031f8cd 100644 --- a/doc/org-gtd.texi +++ b/doc/org-gtd.texi @@ -605,7 +605,7 @@ My org-gtd config for 1.x was as follows: (("C-c d c" . org-gtd-capture) ("C-c d a" . org-agenda-list) ("C-c d p" . org-gtd-process-inbox) - ("C-c d n" . org-gtd-show-all-next) + ("C-c d n" . org-gtd-engage-next) ("C-c d s" . org-gtd-show-stuck-projects) :map org-gtd-process-map ("C-c c" . org-gtd-choose))) @@ -651,7 +651,7 @@ And my config for 2.0 is: (("C-c d c" . org-gtd-capture) ("C-c d e" . org-gtd-engage) ("C-c d p" . org-gtd-process-inbox) - ("C-c d n" . org-gtd-show-all-next) + ("C-c d n" . org-gtd-engage-next) ("C-c d s" . org-gtd-show-stuck-projects) :map org-gtd-process-map ("C-c c" . org-gtd-choose))) @@ -906,7 +906,7 @@ If you are a Doom Emacs user, then your configuration may look something like th :desc "Capture" "c" #'org-gtd-capture :desc "Engage" "e" #'org-gtd-engage :desc "Process inbox" "p" #'org-gtd-process-inbox - :desc "Show all next" "n" #'org-gtd-show-all-next + :desc "Show all next" "n" #'org-gtd-engage-next :desc "Stuck projects" "s" #'org-gtd-review-stuck-projects)) (map! :map org-gtd-clarify-map :desc "Organize this item" "C-c c" #'org-gtd-organize)) @@ -1147,7 +1147,7 @@ Here is an example: You can see a list of all NEXT actions, and scheduled actions, with @code{M-x org-gtd-engage} . -You can call @code{org-gtd-show-all-next} to only see NEXT actions, nothing scheduled. +You can call @code{org-gtd-engage-next} to only see NEXT actions, nothing scheduled. You can use @code{org-gtd-oops} to see all the appointments you missed, and act on them accordingly. diff --git a/org-gtd-archive.el b/org-gtd-archive.el index b408850..c69ca55 100644 --- a/org-gtd-archive.el +++ b/org-gtd-archive.el @@ -31,7 +31,7 @@ (require 'org-element) (require 'org-gtd-core) -(require 'org-gtd-agenda) +(require 'org-gtd-engage) ;;;; Customization diff --git a/org-gtd-autoloads.el b/org-gtd-autoloads.el index 962bed1..b4a4b23 100644 --- a/org-gtd-autoloads.el +++ b/org-gtd-autoloads.el @@ -11,24 +11,6 @@ (register-definition-prefixes "org-gtd" '("org-gtd-")) -;;;*** - -;;;### (autoloads nil "org-gtd-agenda" "org-gtd-agenda.el" (0 0 0 -;;;;;; 0)) -;;; Generated autoloads from org-gtd-agenda.el - -(autoload 'org-gtd-engage "org-gtd-agenda" "\ -Display `org-agenda' customized by org-gtd." t nil) - -(autoload 'org-gtd-show-all-next "org-gtd-agenda" "\ -Show all next actions from all agenda files in a single list. -This assumes all GTD files are also agenda files." t nil) - -(autoload 'org-gtd-engage-grouped-by-context "org-gtd-agenda" "\ -Show all `org-gtd-next' actions grouped by context (tag prefixed with @)." t nil) - -(register-definition-prefixes "org-gtd-agenda" '("org-gtd-agenda--prefix-format")) - ;;;*** ;;;### (autoloads nil "org-gtd-archive" "org-gtd-archive.el" (0 0 @@ -159,6 +141,26 @@ Delegate item at point on agenda view." t nil) (register-definition-prefixes "org-gtd-delegate" '("org-gtd-delegate")) +;;;*** + +;;;### (autoloads nil "org-gtd-engage" "org-gtd-engage.el" (0 0 0 +;;;;;; 0)) +;;; Generated autoloads from org-gtd-engage.el + +(autoload 'org-gtd-engage "org-gtd-engage" "\ +Display `org-agenda' customized by org-gtd." t nil) + +(autoload 'org-gtd-engage-grouped-by-context "org-gtd-engage" "\ +Show all `org-gtd-next' actions grouped by context (tag prefixed with @)." t nil) + +(autoload 'org-gtd-engage-next "org-gtd-engage" "\ +Show all next actions from all agenda files in a single list. +This assumes all GTD files are also agenda files." t nil) + +(defalias 'org-gtd-show-all-next 'org-gtd-engage-next) + +(if (fboundp 'register-definition-prefixes) (register-definition-prefixes "org-gtd-engage" '("org-gtd-agenda--prefix-format"))) + ;;;*** ;;;### (autoloads nil "org-gtd-files" "org-gtd-files.el" (0 0 0 0)) diff --git a/org-gtd-agenda.el b/org-gtd-engage.el similarity index 92% rename from org-gtd-agenda.el rename to org-gtd-engage.el index 39fd25b..6b26367 100644 --- a/org-gtd-agenda.el +++ b/org-gtd-engage.el @@ -1,4 +1,4 @@ -;;; org-gtd-agenda.el --- Manage the agenda view -*- lexical-binding: t; coding: utf-8 -*- +;;; org-gtd-engage.el --- Engage actionable tasks -*- lexical-binding: t; coding: utf-8 -*- ;; ;; Copyright © 2019-2023 Aldric Giacomoni @@ -80,7 +80,7 @@ (org-agenda nil "g")))) ;;;###autoload -(defun org-gtd-show-all-next () +(defun org-gtd-engage-next () "Show all next actions from all agenda files in a single list. This assumes all GTD files are also agenda files." (interactive) @@ -88,6 +88,10 @@ This assumes all GTD files are also agenda files." (with-org-gtd-context (org-todo-list org-gtd-next))) +;;;###autoload +(defalias 'org-gtd-show-all-next 'org-gtd-engage-next) +(make-obsolete 'org-gtd-show-all-next "use `org-gtd-engage-next' instead." "3.0.0") + ;;;; Functions ;;;;; Private @@ -114,6 +118,6 @@ This assumes all GTD files are also agenda files." ;;;; Footer -(provide 'org-gtd-agenda) +(provide 'org-gtd-engage) -;;; org-gtd-agenda.el ends here +;;; org-gtd-engage.el ends here diff --git a/org-gtd-organize.el b/org-gtd-organize.el index 9ba7492..dbf2b61 100644 --- a/org-gtd-organize.el +++ b/org-gtd-organize.el @@ -39,7 +39,7 @@ (require 'org-gtd-single-action) (require 'org-gtd-trash) (require 'org-gtd-delegate) -(require 'org-gtd-agenda) +(require 'org-gtd-engage) (require 'org-gtd-projects) (require 'org-gtd-refile) (require 'org-gtd-process) diff --git a/org-gtd-process.el b/org-gtd-process.el index d7edb33..4cfee88 100644 --- a/org-gtd-process.el +++ b/org-gtd-process.el @@ -28,7 +28,7 @@ (require 'org-gtd-core) (require 'org-gtd-capture) -(require 'org-gtd-agenda) +(require 'org-gtd-engage) (require 'org-gtd-projects) (require 'org-gtd-refile) (require 'org-gtd-clarify) diff --git a/org-gtd-review.el b/org-gtd-review.el index 5a3699f..258b61b 100644 --- a/org-gtd-review.el +++ b/org-gtd-review.el @@ -31,7 +31,7 @@ (require 'org-gtd-core) (require 'org-gtd-areas-of-focus) (require 'org-gtd-skip) -(require 'org-gtd-agenda) +(require 'org-gtd-engage) (require 'org-gtd-projects) ;;;; Commands diff --git a/org-gtd.el b/org-gtd.el index 5d9aaac..7846194 100644 --- a/org-gtd.el +++ b/org-gtd.el @@ -62,7 +62,7 @@ (require 'org-gtd-capture) (require 'org-gtd-refile) (require 'org-gtd-projects) -(require 'org-gtd-agenda) +(require 'org-gtd-engage) (require 'org-gtd-organize) (require 'org-gtd-process) (require 'org-gtd-mode) diff --git a/org-gtd.info b/org-gtd.info index 67027c4..066b0d2 100644 --- a/org-gtd.info +++ b/org-gtd.info @@ -601,7 +601,7 @@ File: org-gtd.info, Node: 200 <- 11x, Prev: 210 <- 200, Up: Upgrading (("C-c d c" . org-gtd-capture) ("C-c d a" . org-agenda-list) ("C-c d p" . org-gtd-process-inbox) - ("C-c d n" . org-gtd-show-all-next) + ("C-c d n" . org-gtd-engage-next) ("C-c d s" . org-gtd-show-stuck-projects) :map org-gtd-process-map ("C-c c" . org-gtd-choose))) @@ -645,7 +645,7 @@ File: org-gtd.info, Node: 200 <- 11x, Prev: 210 <- 200, Up: Upgrading (("C-c d c" . org-gtd-capture) ("C-c d e" . org-gtd-engage) ("C-c d p" . org-gtd-process-inbox) - ("C-c d n" . org-gtd-show-all-next) + ("C-c d n" . org-gtd-engage-next) ("C-c d s" . org-gtd-show-stuck-projects) :map org-gtd-process-map ("C-c c" . org-gtd-choose))) @@ -952,7 +952,7 @@ like this: :desc "Capture" "c" #'org-gtd-capture :desc "Engage" "e" #'org-gtd-engage :desc "Process inbox" "p" #'org-gtd-process-inbox - :desc "Show all next" "n" #'org-gtd-show-all-next + :desc "Show all next" "n" #'org-gtd-engage-next :desc "Stuck projects" "s" #'org-gtd-review-stuck-projects)) (map! :map org-gtd-clarify-map :desc "Organize this item" "C-c c" #'org-gtd-organize)) @@ -1241,8 +1241,8 @@ File: org-gtd.info, Node: Engaging with your GTD items, Next: Working with the You can see a list of all NEXT actions, and scheduled actions, with ‘M-x org-gtd-engage’ . - You can call ‘org-gtd-show-all-next’ to only see NEXT actions, -nothing scheduled. + You can call ‘org-gtd-engage-next’ to only see NEXT actions, nothing +scheduled. You can use ‘org-gtd-oops’ to see all the appointments you missed, and act on them accordingly. @@ -1528,51 +1528,51 @@ Ref: Update org-edna trigger20001 Node: 200 <- 11x20770 Ref: Configuration20896 Ref: Example upgrade22288 -Ref: Relevant commands with new names25228 -Ref: heading states (TODO etc)25445 -Ref: Differentiating GTD types of items25604 -Ref: Multiple refile targets26971 -Ref: Key bindings27823 -Node: Installing28100 -Node: use-package28395 -Node: Manually28607 -Node: Configuring28973 -Node: The easy way29258 -Node: Required configuration of sub-packages29827 -Ref: Configuring org-edna30075 -Node: configuration options for org-gtd30505 -Ref: I don't care just let me start using it30755 -Ref: Tell me all the levers I can pull31344 -Node: Recommended key bindings35328 -Node: Sample Doom Emacs Config36093 -Node: Using Org GTD36967 -Node: Org-mode building blocks for Org GTD37202 -Node: The GTD flow38512 -Node: Adding things to the inbox39098 -Node: Processing the inbox40318 -Node: Clarifying each item40844 -Ref: How to start clarifying41360 -Ref: data shape requirements41865 -Ref: Options and commands related to clarification42426 -Node: Organizing an item into the system43620 -Ref: Choosing a task type44261 -Ref: Applying hooks46394 -Ref: Refiling to the appropriate area46881 -Ref: New project heading47164 -Ref: Other headings47423 -Node: Engaging with your GTD items47963 -Node: Working with the GTD Horizons48529 -Ref: Areas of focus49272 -Ref: Longer-term horizons50556 -Node: Cleaning up / archiving completed work51363 -Node: Commands you can call on org-agenda52228 -Node: Defining your own agenda views53133 -Node: Adding your own hooks when organizing53675 -Node: Automating through emacs54887 -Node: Troubleshooting56024 -Node: Finding lost tasks56265 -Node: Projects without a NEXT item56795 -Node: I can't create a project when clarifying an inbox item!57266 +Ref: Relevant commands with new names25224 +Ref: heading states (TODO etc)25441 +Ref: Differentiating GTD types of items25600 +Ref: Multiple refile targets26967 +Ref: Key bindings27819 +Node: Installing28096 +Node: use-package28391 +Node: Manually28603 +Node: Configuring28969 +Node: The easy way29254 +Node: Required configuration of sub-packages29823 +Ref: Configuring org-edna30071 +Node: configuration options for org-gtd30501 +Ref: I don't care just let me start using it30751 +Ref: Tell me all the levers I can pull31340 +Node: Recommended key bindings35324 +Node: Sample Doom Emacs Config36089 +Node: Using Org GTD36961 +Node: Org-mode building blocks for Org GTD37196 +Node: The GTD flow38506 +Node: Adding things to the inbox39092 +Node: Processing the inbox40312 +Node: Clarifying each item40838 +Ref: How to start clarifying41354 +Ref: data shape requirements41859 +Ref: Options and commands related to clarification42420 +Node: Organizing an item into the system43614 +Ref: Choosing a task type44255 +Ref: Applying hooks46388 +Ref: Refiling to the appropriate area46875 +Ref: New project heading47158 +Ref: Other headings47417 +Node: Engaging with your GTD items47957 +Node: Working with the GTD Horizons48521 +Ref: Areas of focus49264 +Ref: Longer-term horizons50548 +Node: Cleaning up / archiving completed work51355 +Node: Commands you can call on org-agenda52220 +Node: Defining your own agenda views53125 +Node: Adding your own hooks when organizing53667 +Node: Automating through emacs54879 +Node: Troubleshooting56016 +Node: Finding lost tasks56257 +Node: Projects without a NEXT item56787 +Node: I can't create a project when clarifying an inbox item!57258  End Tag Table