From 3e57a654519e5e7af1e84504edb2ea37aba3b052 Mon Sep 17 00:00:00 2001
From: Kyle Meyer <kyle@kyleam.com>
Date: Tue, 3 Feb 2015 02:30:44 -0500
Subject: Merge babel and contacts settings to main Org file

---
 init.el                  |  2 --
 lisp/init-babel.el       | 12 ------------
 lisp/init-org.el         | 25 +++++++++++++++++++++++++
 lisp/init-orgcontacts.el |  9 ---------
 4 files changed, 25 insertions(+), 23 deletions(-)
 delete mode 100644 lisp/init-babel.el
 delete mode 100644 lisp/init-orgcontacts.el

diff --git a/init.el b/init.el
index b13cd62..4ed4382 100644
--- a/init.el
+++ b/init.el
@@ -18,8 +18,6 @@
 (require 'init-diminish)
 
 (require 'init-org)
-(require 'init-orgcontacts)
-(require 'init-babel)
 
 (require 'init-files)
 (require 'init-buffers)
diff --git a/lisp/init-babel.el b/lisp/init-babel.el
deleted file mode 100644
index 615c860..0000000
--- a/lisp/init-babel.el
+++ /dev/null
@@ -1,12 +0,0 @@
-(setq org-confirm-babel-evaluate nil
-      org-src-fontify-natively t)
-
-(org-babel-do-load-languages
- 'org-babel-load-languages
- '((sh . t)
-   (python . t)
-   (R . t)
-   (emacs-lisp . t)
-   (latex . t)))
-
-(provide 'init-babel)
diff --git a/lisp/init-org.el b/lisp/init-org.el
index 2debdcc..29a3757 100644
--- a/lisp/init-org.el
+++ b/lisp/init-org.el
@@ -464,6 +464,31 @@ global value. A numeric prefix sets MAXLEVEL (defaults to 2)."
                  ("\\paragraph{%s}" . "\\paragraph*{%s}")
                  ("\\subparagraph{%s}" . "\\subparagraph*{%s}"))))
 
+
+;;; Org Babel
+
+(setq org-confirm-babel-evaluate nil
+      org-src-fontify-natively t)
+
+(org-babel-do-load-languages
+ 'org-babel-load-languages
+ '((sh . t)
+   (python . t)
+   (R . t)
+   (emacs-lisp . t)
+   (latex . t)))
+
+
+;;; Org Contacts
+
+(require 'org-contacts)
+
+(setq org-contacts-files '("~/notes/contacts.org"))
+
+(add-to-list 'org-capture-templates
+             '("a" "email address" entry (file+headline "~/notes/contacts.org" "Inbox")
+               "** %(org-contacts-template-name)\n   :PROPERTIES:\n   :EMAIL: %(org-contacts-template-email)\n   :END:"))
+
 
 ;;; Org in other modes
 
diff --git a/lisp/init-orgcontacts.el b/lisp/init-orgcontacts.el
deleted file mode 100644
index 548c146..0000000
--- a/lisp/init-orgcontacts.el
+++ /dev/null
@@ -1,9 +0,0 @@
-(require 'org-contacts)
-
-(setq org-contacts-files '("~/notes/contacts.org"))
-
-(add-to-list 'org-capture-templates
-             '("a" "email address" entry (file+headline "~/notes/contacts.org" "Inbox")
-               "** %(org-contacts-template-name)\n   :PROPERTIES:\n   :EMAIL: %(org-contacts-template-email)\n   :END:"))
-
-(provide 'init-orgcontacts)
-- 
cgit v1.2.3