Skip to content
Browse files

Fix vim mappings.

Move content of map_abbr.vim into .vimrc.
  • Loading branch information...
1 parent 31a3e46 commit 83be5b6553b675574a810efc45d42feb3fe21404 @hdemers committed Mar 6, 2013
Showing with 58 additions and 65 deletions.
  1. +0 −64 .vim.symlink/plugin/map_abbr.vim
  2. +58 −1 .vimrc.symlink
View
64 .vim.symlink/plugin/map_abbr.vim
@@ -1,64 +0,0 @@
-"=====================================================================
-" File: ~/.vim/plugin/map_abbr.vim
-" Author: Hugues Demers
-"=====================================================================
-
-"=====================================================================
-" Mappings and Abbreviations
-"=====================================================================
-
-map <Leader>z :b #<CR>
-map <Leader>q :bd<CR>
-map <C-s> :write<CR>
-nnoremap <Leader>/ :nohlsearch<CR>
-map <Leader>w :set wrap<CR>
-map <Leader>W :set nowrap<CR>
-map <Leader>d :vertical diffsplit
-map <Leader>D :set nodiff \| set foldcolumn=0 \| set noscb<CR>
-map <Tab> %
-
-"Moving around mappings
-map <M-Up> <C-W><Up>
-map <M-Down> <C-W><Down>
-map <M-Left> <C-W><Left>
-map <M-Right> <C-W><Right>
-map <C-Up> <C-y>
-map <C-Down> <C-e>
-map <S-Up> <C-W>+
-map <S-Down> <C-W>-
-map <S-Left> <C-W><
-map <S-Right> <C-W>>
-map <C-Right> w
-map <C-Left> b
-
-" Mapping that work in insert mode
-map! <C-s> <ESC>:write<CR>
-map! <C-Up> <C-y>
-map! <C-Down> <C-e>
-map! <M-z> <ESC>:A<CR>
-
-" Mapping to enable/disable spell checking.
-map <Leader>s :set spell<CR>
-map <Leader>S :set nospell<CR>
-
-" Searching using Git
-map <Leader>g :Ggrep <cword><CR>
-
-" Syntastic mapping
-map <Leader>y :SyntasticToggleMode<CR>
-
-" Mapping of function keys
-map <F1> :Explore<CR>
-map <F2> :BufExplorer<CR>
-map <F3> :TagbarToggle<CR>
-map <F6> :Gstatus<CR>
-map <F7> :Gdiff<CR>
-map <F8> :Gcommit<CR>
-map <F9> :GundoToggle<CR>
-
-
-inoremap <C-E> <C-X><C-E>
-inoremap <C-Y> <C-X><C-Y>
-
-" Command-T mappings
-
View
59 .vimrc.symlink
@@ -147,5 +147,62 @@ autocmd FileType html,htmldjango,jinjahtml,eruby,mako let b:closetag_html_style=
autocmd FileType html,xhtml,xml,htmldjango,jinjahtml,eruby,mako source ~/.vim/bundle/closetag/plugin/closetag.vim
" Command for flake8
-autocmd FileType python map <buffer> <F4> :call Flake8()<CR>
+"autocmd FileType python map <buffer> <F4> :call Flake8()<CR>
autocmd BufWritePost *.py call Flake8()
+let g:no_flake8_maps=""
+
+"=====================================================================
+" Mappings and Abbreviations
+"=====================================================================
+
+map <Leader>z :b #<CR>
+map <Leader>q :bd<CR>
+map <C-s> :write<CR>
+nnoremap <Leader>/ :nohlsearch<CR>
+map <Leader>w :set wrap<CR>
+map <Leader>W :set nowrap<CR>
+map <Leader>d :vertical diffsplit
+map <Leader>D :set nodiff \| set foldcolumn=0 \| set noscb<CR>
+map <Tab> %
+
+" Moving around mappings
+map <M-Up> <C-W><Up>
+map <M-Down> <C-W><Down>
+map <M-Left> <C-W><Left>
+map <M-Right> <C-W><Right>
+map <C-Up> <C-y>
+map <C-Down> <C-e>
+map <S-Up> <C-W>+
+map <S-Down> <C-W>-
+map <S-Left> <C-W><
+map <S-Right> <C-W>>
+map <C-Right> w
+map <C-Left> b
+
+" Mapping that work in insert mode
+map! <C-s> <ESC>:write<CR>
+map! <C-Up> <C-y>
+map! <C-Down> <C-e>
+map! <M-z> <ESC>:A<CR>
+
+" Mapping to enable/disable spell checking.
+map <Leader>s :set spell<CR>
+map <Leader>S :set nospell<CR>
+
+" Searching using Git
+map <Leader>G :Ggrep <cword><CR>
+
+" Syntastic mapping
+map <Leader>y :SyntasticToggleMode<CR>
+
+" Mapping of function keys
+map <F1> :Explore<CR>
+map <F2> :BufExplorer<CR>
+map <F3> :TagbarToggle<CR>
+map <F6> :Gstatus<CR>
+map <F7> :Gdiff<CR>
+map <F8> :Gcommit<CR>
+map <F9> :GundoToggle<CR>
+
+inoremap <C-E> <C-X><C-E>
+inoremap <C-Y> <C-X><C-Y>

0 comments on commit 83be5b6

Please sign in to comment.
Something went wrong with that request. Please try again.