Update journal settings

1 files changed, 2 insertions, 14 deletions

diff --git a/.emacs b/.emacs
index 0b65824..a342c3e 100644
--- a/.emacs
+++ b/.emacs
@@ -55,9 +55,8 @@
                               ("a" "記事" entry (file+headline "" "")
                                "* %?\n  %u\n  %a"
                                :empty-lines 1)
-                              ("j" "Journal entry" plain (function org-journal-find-location)
-                               "** %(format-time-string org-journal-time-format)%?"
-                               :empty-lines 1)))
+                              ("j" "日記" entry (file+datetree "~/org/journal.org")
+                               "* %?\n %U\n")))
 (setq org-todo-keywords
       '((sequence "TODO(t)" "WAIT(w)" "|" "DONE(d)" "SOMEDAY(s)" "CANCELED(c)")))
 (org-babel-do-load-languages
@@ -70,17 +69,6 @@
 (require 'org-bullets)
 (add-hook 'org-mode-hook (lambda () (org-bullets-mode 1)))
 
-;;; org-journal
-(setq org-journal-dir "~/org/journal/")
-(setq org-journal-date-format "%Y年%m月%d日 (%a)")
-(defun org-journal-find-location ()
-  ;; Open today's journal, but specify a non-nil prefix argument in order to
-  ;; inhibit inserting the heading; org-capture will insert the heading.
-  (org-journal-new-entry t)
-  (unless (eq org-journal-file-type 'daily)
-    (org-narrow-to-subtree))
-  (goto-char (point-max)))
-
 ;;; SKK
 (setq default-input-method "japanese-skk")