Load elpy and use size 14 font by default.

[Dotty.git] / emacs / .emacs

diff --git a/emacs/.emacs b/emacs/.emacs
index b7c44487dc6fb83552d5f29cda3a5db8508c92a7..fc8ff518293da630b0669cf5eee8abcae22853d9 100644 (file)
--- a/emacs/.emacs
+++ b/emacs/.emacs
@@ -21,8 +21,8 @@
  'org-babel-load-languages
  '((R . t)
    (latex . t)))
-;; This needs to be fixed - option below results in error when enabled
-;;(org-confirm-babel-evaluate nil)
+;; Security risk - This is somewhat ill-advised it appears
+(setq org-confirm-babel-evaluate nil)
 
 ;; Automatically switch to various modes
 (setq auto-mode-alist
@@ -63,12 +63,12 @@
  '(org-export-backends (quote (ascii html icalendar latex md odt)))
  '(package-selected-packages
    (quote
-    (org htmlize leuven-theme lua-mode ess-R-data-view ess))))
+    (elpy ## org htmlize leuven-theme lua-mode ess-smart-underscore ess-R-data-view ess))))
 (custom-set-faces
  ;; custom-set-faces was added by Custom.
  ;; If you edit it by hand, you could mess it up, so be careful.
  ;; Your init file should contain only one such instance.
  ;; If there is more than one, they won't work right.
- )
+ '(default ((t (:family "Source Code Pro" :foundry "ADBO" :slant normal :weight normal :height 143 :width normal)))))