From b59a27a1602246112324a9f5725f94f51a6f14c7 Mon Sep 17 00:00:00 2001 From: Patrick Elliott Date: Wed, 10 Oct 2018 17:36:25 +0200 Subject: [PATCH 1/4] Built-in capture templates add a link to the file from where capture was initiated --- modules/lang/org/+capture.el | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/modules/lang/org/+capture.el b/modules/lang/org/+capture.el index 03988510e..c9cacae3a 100644 --- a/modules/lang/org/+capture.el +++ b/modules/lang/org/+capture.el @@ -31,23 +31,23 @@ It is used in Doom's default `org-capture-templates'.") (defvar org-capture-templates '(("t" "Personal todo" entry (file+headline +org-capture-todo-file "Inbox") - "* [ ] %?\n%i" :prepend t :kill-buffer t) + "* [ ] %?\n%i\n%a" :prepend t :kill-buffer t) ("n" "Personal notes" entry (file+headline +org-capture-notes-file "Inbox") - "* %u %?\n%i" :prepend t :kill-buffer t) + "* %u %?\n%i\n%a" :prepend t :kill-buffer t) ;; Will use {project-root}/{todo,notes,changelog}.org, unless a ;; {todo,notes,changelog}.org file is found in a parent directory. ("p" "Templates for projects") ("pt" "Project todo" entry ; {project-root}/todo.org (file+headline +org-capture-project-todo-file "Inbox") - "* [ ] %?\n%i" :prepend t :kill-buffer t) + "* [ ] %?\n%i\n%a" :prepend t :kill-buffer t) ("pn" "Project notes" entry ; {project-root}/notes.org (file+headline +org-capture-project-notes-file "Inbox") - "* [ ] %?\n%i" :prepend t :kill-buffer t) + "* [ ] %?\n%i\n%a" :prepend t :kill-buffer t) ("pc" "Project changelog" entry ; {project-root}/changelog.org (file+headline +org-capture-project-notes-file "Unreleased") - "* [ ] %?\n%i" :prepend t :kill-buffer t))) + "* [ ] %?\n%i\n%a" :prepend t :kill-buffer t))) (defvar org-default-notes-file nil) ; defined in org.el From 623195e312ef5009b8eaec7134d2b01749eeb280 Mon Sep 17 00:00:00 2001 From: Patrick Elliott Date: Thu, 11 Oct 2018 10:41:39 +0200 Subject: [PATCH 2/4] Checkboxes -> TODOs --- modules/lang/org/+capture.el | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/modules/lang/org/+capture.el b/modules/lang/org/+capture.el index c9cacae3a..67a76d182 100644 --- a/modules/lang/org/+capture.el +++ b/modules/lang/org/+capture.el @@ -31,7 +31,7 @@ It is used in Doom's default `org-capture-templates'.") (defvar org-capture-templates '(("t" "Personal todo" entry (file+headline +org-capture-todo-file "Inbox") - "* [ ] %?\n%i\n%a" :prepend t :kill-buffer t) + "* TODO %?\n%i\n%a" :prepend t :kill-buffer t) ("n" "Personal notes" entry (file+headline +org-capture-notes-file "Inbox") "* %u %?\n%i\n%a" :prepend t :kill-buffer t) @@ -41,13 +41,13 @@ It is used in Doom's default `org-capture-templates'.") ("p" "Templates for projects") ("pt" "Project todo" entry ; {project-root}/todo.org (file+headline +org-capture-project-todo-file "Inbox") - "* [ ] %?\n%i\n%a" :prepend t :kill-buffer t) + "* TODO %?\n%i\n%a" :prepend t :kill-buffer t) ("pn" "Project notes" entry ; {project-root}/notes.org (file+headline +org-capture-project-notes-file "Inbox") - "* [ ] %?\n%i\n%a" :prepend t :kill-buffer t) + "* TODO %?\n%i\n%a" :prepend t :kill-buffer t) ("pc" "Project changelog" entry ; {project-root}/changelog.org (file+headline +org-capture-project-notes-file "Unreleased") - "* [ ] %?\n%i\n%a" :prepend t :kill-buffer t))) + "* TODO %?\n%i\n%a" :prepend t :kill-buffer t))) (defvar org-default-notes-file nil) ; defined in org.el From 7cb1e489dcabf02755bbd69f42d34748cfb6a7dc Mon Sep 17 00:00:00 2001 From: Patrick Elliott Date: Mon, 15 Oct 2018 13:39:24 +0200 Subject: [PATCH 3/4] Revert personal TODO back to checkbox in capture template --- modules/lang/org/+capture.el | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/lang/org/+capture.el b/modules/lang/org/+capture.el index 67a76d182..e665d0b7e 100644 --- a/modules/lang/org/+capture.el +++ b/modules/lang/org/+capture.el @@ -31,7 +31,7 @@ It is used in Doom's default `org-capture-templates'.") (defvar org-capture-templates '(("t" "Personal todo" entry (file+headline +org-capture-todo-file "Inbox") - "* TODO %?\n%i\n%a" :prepend t :kill-buffer t) + "* [] %?\n%i\n%a" :prepend t :kill-buffer t) ("n" "Personal notes" entry (file+headline +org-capture-notes-file "Inbox") "* %u %?\n%i\n%a" :prepend t :kill-buffer t) From 53cf2b4e2bbeaf1ef21f7c45789d4c04338488f5 Mon Sep 17 00:00:00 2001 From: Henrik Lissner Date: Mon, 15 Oct 2018 22:44:39 -0400 Subject: [PATCH 4/4] Restore space in personal todo checkbox --- modules/lang/org/+capture.el | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/lang/org/+capture.el b/modules/lang/org/+capture.el index e665d0b7e..3b8edc8c7 100644 --- a/modules/lang/org/+capture.el +++ b/modules/lang/org/+capture.el @@ -31,7 +31,7 @@ It is used in Doom's default `org-capture-templates'.") (defvar org-capture-templates '(("t" "Personal todo" entry (file+headline +org-capture-todo-file "Inbox") - "* [] %?\n%i\n%a" :prepend t :kill-buffer t) + "* [ ] %?\n%i\n%a" :prepend t :kill-buffer t) ("n" "Personal notes" entry (file+headline +org-capture-notes-file "Inbox") "* %u %?\n%i\n%a" :prepend t :kill-buffer t)