home

commit 585d99e518fd2f6cb648113d988e642f0183cee8
parent a6bb1e1bfa5d1050213c223adc92d7da5290b103
Author: Vincent Demeester <vincent@sbr.pm>
Date:   Mon, 16 Mar 2020 17:45:50 +0100

Merge commit 'c689794e830ab4d7253e59874e20064a2057a614'

Diffstat:
M
tmp/emacs-config/config/setup-org.el
 | 
4
++--
M
tmp/emacs-config/emacs.org
 | 
8
+-------

2 files changed, 3 insertions(+), 9 deletions(-)
diff --git a/tmp/emacs-config/config/setup-org.el b/tmp/emacs-config/config/setup-org.el
@@ -250,10 +250,10 @@
                  :empty-lines 1))
   ;; -OrgCaptureTask
 
-  ;; OrgCaptureJournal
+  ;; OrgCaptureJournalBase
   (add-to-list 'org-capture-templates
                `("j" "Journal"))
-  ;; -OrgCaptureJournal
+  ;; -OrgCaptureJournalBase
 
   ;; OrgCaptureJournalEntry
   (add-to-list 'org-capture-templates
diff --git a/tmp/emacs-config/emacs.org b/tmp/emacs-config/emacs.org
@@ -792,12 +792,6 @@
 (like templates related to /work/, …).
 
 #+INCLUDE: "./config/setup-org.el" src emacs-lisp :range-begin "OrgCaptureStart" :range-end "-OrgCaptureStart" :lines "220-224"
-#+begin_src emacs-lisp
-(use-package org-capture
-  :after org
-  :commands (org-capture)
-  :config
-#+end_src
 
 Some of my capture template are big and hard to read if embedded in the =emacs-lisp=
 code. The good thing is that =org-mode= is able to load the template from files too 💃.
@@ -814,7 +808,7 @@
 - journaling :: As I use =org-mode= for my /journal/ too, I need capture entry for
   it. I currently have two types of journal entry :
 
-  #+INCLUDE: "./config/setup-org.el" src emacs-lisp :range-begin "OrgCaptureJournal" :range-end "-OrgCaptureJournal" :lines "254-256"
+  #+INCLUDE: "./config/setup-org.el" src emacs-lisp :range-begin "OrgCaptureJournalBase" :range-end "-OrgCaptureJournalBase" :lines "254-256"
 
   + standard: one title and some text