add papers type and reftex citation fix, ediff setup, and org-habit

diff --git a/.emacs b/.emacs
index 9d95223d256d4cf4f3ca51f3e4a39e9ce3d8fa29..168aaf0167c98c4146a4d21118157183b3a1bac1 100644 (file)
--- a/.emacs
+++ b/.emacs
@@ -197,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.
@@ -560,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)
   )
@@ -575,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/
@@ -690,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)