Maintenance stuff

derekwyatt · Mar 1, 2011 · aa46ea1 · aa46ea1
1 parent c053372
commit aa46ea1
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 13 deletions.
diff --git a/.gitignore b/.gitignore
@@ -4,11 +4,3 @@ tags
 # Ignore Vim swap files
 .*.swp
 .*.swo
-
-# The following are projects I have out on github
-vimruntime/vimfiles/bundle/vim-scala/*
-vimruntime/vimfiles/bundle/vim-fswitch/*
-vimruntime/vimfiles/bundle/vim-protodef/*
-
-# Ignore Tim Pope's Git integration bundle
-vimruntime/vimfiles/bundle/vim-fugitive/*
diff --git a/after/ftplugin/scala.vim b/after/ftplugin/scala.vim
@@ -0,0 +1,5 @@
+
+setlocal textwidth=120
+setlocal shiftwidth=2
+setlocal softtabstop=2
+setlocal expandtab
diff --git a/doc/akka_info.txt b/doc/akka_info.txt
@@ -280,11 +280,13 @@ There is a plus side here, though... the caller that receives the {Future}
 need not be an {Actor}, as is the case in the !! call.  Using the exact same
 {SyncServerActor} defined above, we have:
 !sc!
-scala> val future = server !!! SyncGreetRequest("Hithere, SyncServerActor")
+    scala> val future = server !!! SyncGreetRequest("Hithere, SyncServerActor")
-future: akka.dispatch.Future[Nothing] = akka.dispatch.DefaultCompletableFuture@bf3fd22
+    future: akka.dispatch.Future[Nothing] =
-
+      akka.dispatch.DefaultCompletableFuture@bf3fd22
-scala> future.result
+
-res16: Option[Nothing] = Some(You said, 'Hithere, SyncServerActor', and I say 'Thanks')
+    scala> future.result
+    res16: Option[Nothing] =
+      Some(You said, 'Hithere, SyncServerActor', and I say 'Thanks')
 !/sc!
 
 Modelines: {{{1