Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

Merge branch 'master' of github.com:derekwyatt/vim-config

  • Loading branch information...
commit 82dffc607fb552605d9fa0515930e68a53b0822a 2 parents d612adf + 6ec2440
@derekwyatt authored
Showing with 10 additions and 2 deletions.
  1. +5 −1 vimrc
  2. +5 −1 xpt-personal/ftplugin/scala/scala.xpt.vim
View
6 vimrc
@@ -754,7 +754,11 @@ iab teh the
"-----------------------------------------------------------------------------
if has("gui_running")
exe "set guifont=" . g:main_font
- set background=dark
+ if hostname() == "dqw-linux"
+ set background=light
+ else
+ set background=dark
+ endif
colorscheme solarized
if !exists("g:vimrcloaded")
winpos 0 0
View
6 xpt-personal/ftplugin/scala/scala.xpt.vim
@@ -228,14 +228,18 @@ XPT akkatest hint=Test\ file\ for\ Akka\ code
import akka.actor.ActorSystem
import akka.testkit.{TestKit, ImplicitSender}
-import org.scalatest.WordSpec
+import org.scalatest.{WordSpec, BeforeAndAfterAll}
import org.scalatest.matchers.MustMatchers
class `classname()^(_system: ActorSystem) extends TestKit(_system)
with ImplicitSender
with WordSpec
+ with BeforeAndAfterAll
with MustMatchers {
def this() = this(ActorSystem("`classname()^"))
+ override def afterAll() {
+ system.shutdown()
+ }
"`classNameFromSpec()^" should { //{1
`cursor^
Please sign in to comment.
Something went wrong with that request. Please try again.