Commit 3c5cfeec0501

Vincent Demeester <vincent+git@demeester.fr>
2014-04-15 15:38:20
Install ensime only if sbt is present
1 parent 3f6aacc
Changed files (1)
.emacs.d
.emacs.d/init.el
@@ -79,11 +79,11 @@
 ;; (unless (string-match "apple-darwin" system-configuration)
 ;; ...)
 
-;; (when (ignore-errors
-;;      (el-get-executable-find "svn")
-;;      (loop for p in '(psvn                 ;; M-x svn-status
-;;                       )
-;;            do (add-to-list 'el-get-sources p))))
+(when (ignore-errors
+        (executable-find "sbt")
+        (loop for p in '(ensime
+                         )
+              do (add-to-list 'el-get-packages p))))
 
 ;; getelget -- bootstrap el-get if necessary and load the specified packages
 (load-library "getelget.el")
@@ -213,14 +213,6 @@
 (global-set-key (kbd "C-+") 'text-scale-increase)
 (global-set-key (kbd "C--") 'text-scale-decrease)
 
-;; Special ensime/scala
-(when (file-exists-p "/usr/share/ensime/elisp")
-  (add-to-list 'load-path "/usr/share/ensime/elisp")
-  (add-to-list 'exec-path "/usr/share/ensime")
-  (require 'ensime)
-  (add-hook 'scala-mode-hook 'ensime-scala-mode-hook)
-  )
-
 ;; Server
 (unless (string= (user-login-name) "root")
   (require 'server)