aboutsummaryrefslogtreecommitdiff
path: root/.emacs
diff options
context:
space:
mode:
authorRyan Kavanagh <rak@debian.org>2017-02-06 11:59:38 -0500
committerRyan Kavanagh <rak@debian.org>2017-02-06 11:59:38 -0500
commitc411fd1c07a1b0861550339661c8d5be06b80c0a (patch)
tree034b942631c6c10281ea477f71600a49dc3555b0 /.emacs
parentUpdate some mutt savehooks (diff)
Add R and ocaml packages to emacs
Diffstat (limited to '.emacs')
-rw-r--r--.emacs11
1 files changed, 11 insertions, 0 deletions
diff --git a/.emacs b/.emacs
index aa794d1..2d5255a 100644
--- a/.emacs
+++ b/.emacs
@@ -85,6 +85,17 @@
:ensure t)
(use-package sass-mode
:ensure t)
+(use-package ess
+ :ensure t)
+(use-package merlin
+ :ensure t)
+(use-package ocp-indent
+ :ensure t)
+(use-package tuareg
+ :ensure t
+ :config
+ (add-hook 'tuareg-mode-hook 'merlin-mode t))
+
;;;; AUTO FILL
; We want auto-fill enabled for all text modes