fix notes location, and log into drawer

diff --git a/emacs_el/configuration/org-mode-configuration.el b/emacs_el/configuration/org-mode-configuration.el
index daa930da8e4dd8e92e709304297fa708f78ca379..e290d3fa56246f620aea602f9ecf6c1cd3a4c307 100644 (file)
--- a/emacs_el/configuration/org-mode-configuration.el
+++ b/emacs_el/configuration/org-mode-configuration.el
@@ -349,8 +349,8 @@ Maildir, or by Message-ID."
        (progn
          (reftex-parse-all)
          (reftex-set-cite-format
-          '((?b . "[[bib::%l][%l-bib]]")
-            (?n . "[[note::%l][%l-notes]]")
+          '((?b . "[[bib:%l][%l-bib]]")
+            (?n . "[[notes:%l][%l-notes]]")
             (?c . "\\cite{%l}")
             (?h . "*** %t\n:PROPERTIES:\n:Custom_ID: %l\n:END:\n[[papers:%l][%l paper]]")))
          ))
@@ -363,7 +363,7 @@ Maildir, or by Message-ID."
 
 (defun org-mode-reftex-search ()
   (interactive)
-  (org-open-link-from-string (format "[[notes:%s]]" (reftex-citation t))))
+  (org-open-link-from-string (format "[[notes:%s]]" (first (reftex-citation t)))))
 
 (defun open-research-paper (bibtexkey)
   "Open a paper by bibtex key"
@@ -373,6 +373,10 @@ Maildir, or by Message-ID."
        (substitute-in-file-name "$HOME/bin/bibtex_to_paper") bibtexkey)))
 (org-add-link-type "papers" 'open-research-paper)
 
+(add-to-list 'org-link-abbrev-alist
+             '("notes" .
+               "~/projects/research/paper_notes.org::#%s"))
+
 ; I pretty much always want hiearchical checkboxes
 (setq org-hierachical-checkbox-statistics nil)
  
@@ -768,6 +772,7 @@ Skip project and sub-project tasks, habits, and loose non-project tasks."
 (setq org-drawers (quote ("PROPERTIES" "LOGBOOK")))
 ;; Save clock data and state changes and notes in the LOGBOOK drawer
 (setq org-clock-into-drawer t)
+(setq org-log-into-drawer t)
 ;; Sometimes I change tasks I'm clocking quickly - this removes clocked tasks with 0:00 duration
 (setq org-clock-out-remove-zero-time-clocks t)
 ;; Clock out when moving task to a done state