Browse files

Miscellanous updates

- Added the VisIncr plugin. I took it out a while ago, but missed it.
- Added some searches for unicode ⇒ thanks to http://stackoverflow.com/questions/20845184/having-f-move-to-either-or
- Took the safety net out - i.e. no backup or swap files
- Cleaned up the scala case class snippet
- Added some special handling for markdown files
  • Loading branch information...
1 parent ab9009b commit cbc9a0d69c67043e69c6656d4b4c4c1a4e9288bd @derekwyatt committed Jan 1, 2014
Showing with 19 additions and 1 deletion.
  1. +1 −0 bundle/.gitignore
  2. +1 −0 bundle/from_github.md
  3. +2 −0 ftplugin/markdown.vim
  4. +9 −0 ftplugin/scala.vim
  5. +5 −0 vimrc
  6. +1 −1 xpt-personal/ftplugin/scala/scala.xpt.vim
View
1 bundle/.gitignore
@@ -40,4 +40,5 @@ vim-unimpaired
vim-vimproc
vim-vimshell
vim-vimside
+vim-visincr
vim-xptemplate
View
1 bundle/from_github.md
@@ -20,4 +20,5 @@
* **Surround**: `git clone https://github.com/tpope/vim-surround.git vim-surround`
* **TwitVim**: `git clone https://github.com/vim-scripts/TwitVim.git vim-twitvim`
* **Unimpaired**: `git clone https://github.com/tpope/vim-unimpaired.git vim-unimpaired`
+* **VisIncr**: `git clone https://github.com/vim-scripts/VisIncr.git vim-visincr`
* **XPTemplate**: `git clone https://github.com/drmingdrmer/xptemplate.git vim-xptemplate`
View
2 ftplugin/markdown.vim
@@ -0,0 +1,2 @@
+setlocal tw=0
+imap <buffer> jw <esc>:w<cr>a
View
9 ftplugin/scala.vim
@@ -74,3 +74,12 @@ nmap <buffer> <silent> ,ok :ScalaSwitchAbove<cr>
nmap <buffer> <silent> ,oK :ScalaSwitchSplitAbove<cr>
nmap <buffer> <silent> ,oj :ScalaSwitchBelow<cr>
nmap <buffer> <silent> ,oJ :ScalaSwitchSplitBelow<cr>
+
+nnoremap <buffer> <silent> f= :call search('=\\\|⇒')<cr>
+nnoremap <buffer> <silent> F= :call search('=\\\|⇒', 'b')<cr>
+nnoremap <buffer> <silent> t= :call search('.\\%(=\\\|⇒\\)')<cr>
+nnoremap <buffer> <silent> T= :call search('\\%(=\\\|⇒\\).', 'be')<cr>
+nnoremap <buffer> <silent> f> :call search('>\\\|⇒')<cr>
+nnoremap <buffer> <silent> F> :call search('>\\\|⇒', 'b')<cr>
+nnoremap <buffer> <silent> t> :call search('.\\%(>\\\|⇒\\)')<cr>
+nnoremap <buffer> <silent> T> :call search('\\%(>\\\|⇒\\).', 'be')<cr>
View
5 vimrc
@@ -166,6 +166,11 @@ set wildignore+=*.o,*.class,*.git,*.svn
" sucks. Setting it to double makes it awesome.
set ambiwidth=double
+" OK, so I'm gonna remove the VIM safety net for a while and see if kicks my ass
+set nobackup
+set nowritebackup
+set noswapfile
+
" dictionary for english words
" I don't actually use this much at all and it makes my life difficult in general
"set dictionary=$VIM/words.txt
View
2 xpt-personal/ftplugin/scala/scala.xpt.vim
@@ -132,7 +132,7 @@ XPT afun hint=Creates\ an\ anonymous\ function
}
XPT cclass hint=Creates\ a\ case\ class
-case class `className^(`...^`val^ `attrName^: `type^`...^)
+case class `className^(`...^`attrName^: `type^`...^)
XPT cobj hint=Creates\ a\ case\ object
case object `objectName^

0 comments on commit cbc9a0d

Please sign in to comment.