X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=.emacs;h=65a31cacae7119b9640cf43687c72992ed105d9a;hb=f0a56ff81b965eea7d78cef833f0fb19e1970329;hp=5fe719e7df4f3b2c956cdbf4110edee178664398;hpb=be7768a74ce2c3531dfa47094e4d6c3344cec7ca;p=emacs.git

diff --git a/.emacs b/.emacs
index 5fe719e..65a31ca 100644
--- a/.emacs
+++ b/.emacs
@@ -98,10 +98,11 @@
 	      "~/projects/sysadmin/sndservers/sndservers.org"
 	      "~/projects/chaim/chaim.org"
 	      "~/projects/chaim/papers/gwas_paper_2012/gwas_paper.org"
+          "~/projects/reviews/reviews.org"
 	      "~/projects/fh/fh.org")))
 
 (setq org-global-properties '(("Effort_ALL 0 0:10 0:30 1:00 2:00 3:00 4:00 5:00 6:00 7:00")))
-(setq org-columns-default-format "%40ITEM(Task) %TAGS %PRIORITY %TODO %13SCHEDULED %17Effort(Estimated Effort){:} %CLOCKSUM")
+(setq org-columns-default-format "%40ITEM(Task) %TAGS %PRIORITY %TODO %13SCHEDULED %13DEADLINE %6Effort{:}  %CLOCKSUM")
 
 (setq org-default-notes-file "~/projects/notes/notes.org")
 (setq org-capture-templates  ;; mail-specific note template, identified by "m"
@@ -196,6 +197,9 @@
   (setq my-org-protocol-flag t))
 
 
+;; org modules
+(add-to-list 'org-modules 'org-habit)
+
 ; this comes from http://upsilon.cc/~zack/blog/posts/2010/02/integrating_Mutt_with_Org-mode/
 (defun open-mail-in-mutt (message)
   "Open a mail message in Mutt, using an external terminal.
@@ -559,6 +563,7 @@ Argument DESCRIPTION MIME description."
             (?h . "*** %t\n:PROPERTIES:\n:Custom_ID: %l\n:END:\n[[papers:%l][%l paper]]")))
          ))
   (define-key org-mode-map (kbd "C-c )") 'reftex-citation)
+  (define-key org-mode-map (kbd "C-c [") 'reftex-citation)
   (define-key org-mode-map (kbd "C-c (") 'org-mode-reftex-search)
   (define-key org-mode-map (kbd "C-c 0") 'reftex-view-crossref)
   )
@@ -574,6 +579,8 @@ Argument DESCRIPTION MIME description."
   (shell-command
    (format "%s %s"
        (substitute-in-file-name "$HOME/bin/bibtex_to_paper") bibtexkey)))
+(org-add-link-type "papers" 'open-research-paper)
+
 
 ;; stolen from
 ;; http://www-public.it-sudparis.eu/~berger_o/weblog/2012/03/23/how-to-manage-and-export-bibliographic-notesrefs-in-org-mode/
@@ -689,6 +696,10 @@ Argument DESCRIPTION MIME description."
 (setq-default debian-changelog-mailing-address "don@debian.org")
 (setq-default debian-changelog-full-name "Don Armstrong")
 
+; ediff configuration
+; don't use the multi-window configuration
+(setq ediff-window-setup-function 'ediff-setup-windows-plain)
+
 ; use iedit
 (require 'iedit)
 (define-key global-map (kbd "C-;") 'iedit-mode)