--- a/.hgsub Wed Jul 17 23:15:26 2013 -0400
+++ b/.hgsub Thu Jul 18 00:17:35 2013 -0400
@@ -26,6 +26,7 @@
vim/bundle/rainbow-parentheses = [git]git://github.com/kien/rainbow_parentheses.vim.git
vim/bundle/repeat = [git]git://github.com/tpope/vim-repeat.git
vim/bundle/scala = [git]git://github.com/derekwyatt/vim-scala.git
+vim/bundle/scaladoc = [git]git://github.com/sjl/vim-scaladoc.git
vim/bundle/smartinput = [git]git://github.com/kana/vim-smartinput.git
vim/bundle/sparkup = [git]git://github.com/sjl/vim-sparkup.git
vim/bundle/splice = [hg]https://bitbucket.org/sjl/splice.vim
--- a/.hgsubstate Wed Jul 17 23:15:26 2013 -0400
+++ b/.hgsubstate Thu Jul 18 00:17:35 2013 -0400
@@ -26,6 +26,7 @@
eb8baa5428bde10ecc1cb14eed1d6e16f5f24695 vim/bundle/rainbow-parentheses
613eb1c81261adfa5dead315089c432ff6dbbc51 vim/bundle/repeat
c81f87ca6786142b531e66a948effacc03a02184 vim/bundle/scala
+1f797fda2c457202cf62d9a082a3fccd4278e3bf vim/bundle/scaladoc
78ab4b3df24fa2753d3dfc1be75ed5a3df1565b8 vim/bundle/smartinput
c6197a10ace82e0fe0c08e5cf5c017b7069a978e vim/bundle/sparkup
01e68795c7a14b97ec2ebbd70b0fcb42d1adac61 vim/bundle/splice
--- a/vim/vimrc Wed Jul 17 23:15:26 2013 -0400
+++ b/vim/vimrc Thu Jul 18 00:17:35 2013 -0400
@@ -1026,6 +1026,9 @@
au Filetype scala setlocal foldmethod=indent
au Filetype scala compiler maven
au Filetype scala let b:dispatch = 'mvn -B package install'
+ au Filetype scala nnoremap <buffer> <localleader>s :SortScalaImports<cr>
+ au Filetype scala nnoremap <buffer> M :call scaladoc#Search(expand("<cword>"))<cr>
+ au Filetype scala vnoremap <buffer> M "ry:call scaladoc#Search(@r)<cr>
augroup END
" }}}