Permalink
Browse files

Fix vimfile mappings

  • Loading branch information...
1 parent 278b038 commit f421e66297cd80a7f6088f701360d812e3e8e937 @gumayunov committed Mar 22, 2012
Showing with 58 additions and 3 deletions.
  1. +7 −1 install
  2. +2 −2 { → patches}/syntastic.patch
  3. +28 −0 patches/vimfiles-vimrc.patch
  4. +21 −0 vimrc
View
@@ -62,10 +62,16 @@ git submodule update
git submodule foreach git co master
git submodule foreach git pull
+
+echo "Patching vimfiles/vimrc"
+
+CUR=`pwd`
+cp patches/vimfiles-vimrc.patch ~/.vim/ && cd ~/.vim/ && cat vimfiles-vimrc.patch | patch -p && rm vimfiles-vimrc.patch && cd $CUR
+
echo "\nDone"
echo "To patch vim syntastic plugin to support 1.9 syntax do:"
-echo "cp syntastic.patch ~/.vim/bunle/syntastic/ && cd ~/.vim/bundle/syntastic/ && cat syntastic.patch | patch -p"
+echo "cp patches/syntastic.patch ~/.vim/bunle/syntastic/ && cd ~/.vim/bundle/syntastic/ && cat syntastic.patch | patch -p"
echo "========================================================"
echo "Warning! Remember that after the installation Git is configured to use the default name and email."
echo "In order to change them you should edit the [user] section in the ~/.gitconfig file."
@@ -1,13 +1,13 @@
diff --git syntax_checkers/ruby/mri.vim syntax_checkers/ruby/mri.vim
-index 50a8a11..1c9659c 100644
+index 50a8a11..baab993 100644
--- syntax_checkers/ruby/mri.vim
+++ syntax_checkers/ruby/mri.vim
@@ -14,7 +14,7 @@ function! SyntaxCheckers_ruby_GetLocList()
if has('win32') || has('win64')
let makeprg = 'ruby -W1 -T1 -c '.shellescape(expand('%'))
else
- let makeprg = 'RUBYOPT= ruby -W1 -c '.shellescape(expand('%'))
-+ let makeprg = 'RUBYOPT= rvm 1.9.3 do ruby -W1 -c '.shellescape(expand('%'))
++ let makeprg = 'RUBYOPT= rvm ruby-1.9.3-p0-falcon do ruby -W1 -c '.shellescape(expand('%'))
endif
let errorformat = '%-GSyntax OK,%E%f:%l: syntax error\, %m,%Z%p^,%W%f:%l: warning: %m,%Z%p^,%W%f:%l: %m,%-C%.%#'
@@ -0,0 +1,28 @@
+diff --git vimrc vimrc
+index b3282a1..ea4466a 100644
+--- vimrc
++++ vimrc
+@@ -431,14 +431,14 @@ let g:user_zen_settings = {
+ imap {<CR> {}<ESC>i<CR><ESC>O
+
+ " NERDTree settings
+-nmap wm :NERDTree<cr>
++"nmap wm :NERDTree<cr>
+ let NERDTreeIgnore=['\.swp$']
+
+-nnoremap <Esc>A <up>
+-nnoremap <Esc>B <down>
+-nnoremap <Esc>C <right>
+-nnoremap <Esc>D <left>
+-inoremap <Esc>A <up>
+-inoremap <Esc>B <down>
+-inoremap <Esc>C <right>
+-inoremap <Esc>D <left>
++"nnoremap <Esc>A <up>
++"nnoremap <Esc>B <down>
++"nnoremap <Esc>C <right>
++"nnoremap <Esc>D <left>
++"inoremap <Esc>A <up>
++"inoremap <Esc>B <down>
++"inoremap <Esc>C <right>
++"inoremap <Esc>D <left>
View
21 vimrc
@@ -2,6 +2,7 @@ let g:CSApprox_loaded = 1
source ~/.vim/vimrc
+
set nowrap
" Поиск будет учитывать регистр только если в строке поиска присутствую
@@ -329,3 +330,23 @@ map <F10> :echo "hi<" . synIDattr(synID(line("."),col("."),1),"name") . '> trans
\ . synIDattr(synID(line("."),col("."),0),"name") . "> lo<"
\ . synIDattr(synIDtrans(synID(line("."),col("."),1)),"name") . ">"<CR>
+map <Leader>o :CtrlP<CR>
+set wildignore+=*/tmp/*,*.so,*.swp,*.zip,*.scssc,*.sassc
+
+
+" Fix vimfiles mappings
+
+nnoremap <C-L> :nohls<CR><C-L>
+inoremap <C-L> <C-O>:nohls<CR>
+
+" User vim as it supposed to deal with
+
+"inoremap <Up> <NOP>
+"inoremap <Down> <NOP>
+"inoremap <Left> <NOP>
+"inoremap <Right> <NOP>
+"noremap <Up> <NOP>
+"noremap <Down> <NOP>
+"noremap <Left> <NOP>
+"noremap <Right> <NOP>
+

0 comments on commit f421e66

Please sign in to comment.