Permalink
Browse files

Update submodules.

  • Loading branch information...
1 parent 2455cf8 commit f56682598930a75d40f67b5579dd510923572625 @bretthoerner committed Dec 23, 2012
Showing with 12 additions and 9 deletions.
  1. +5 −2 init.el
  2. +1 −1 submodules/ac-slime
  3. +1 −1 submodules/clojure-mode
  4. +1 −1 submodules/coffee-mode
  5. +1 −1 submodules/evil
  6. +1 −1 submodules/scala-mode2
  7. +1 −1 submodules/slime
  8. +1 −1 submodules/yasnippet
View
@@ -406,7 +406,7 @@ makes)."
(if (eq bjh-color 'dark)
(setq term-default-bg-color "#000000"
term-default-fg-color "white"
- ansi-term-color-vector [term-face
+ ansi-term-color-vector [term
bjh-term-color-black
bjh-term-color-red
bjh-term-color-green
@@ -628,7 +628,10 @@ makes)."
;; scala
(add-to-list 'load-path (concat dotfiles-dir "scala-mode2"))
-(require 'scala-mode)
+(require 'scala-mode2)
+(add-to-list 'load-path (expand-file-name "~/Development/src-mirror/ensime/dist_2.10.0-RC3/elisp"))
+(require 'ensime)
+(add-hook 'scala-mode-hook 'ensime-scala-mode-hook)
;; scpaste
(require 'scpaste)
Submodule evil updated from 5d7215 to ab6c24
Submodule slime updated from 7c2b83 to 0d08d3

0 comments on commit f566825

Please sign in to comment.