new plugin: indent-object + solve key conflict

This commit is contained in:
Loic Nageleisen 2012-02-03 12:53:51 +01:00
parent 51c3608343
commit e256d3b5a5
3 changed files with 8 additions and 1 deletions

3
.gitmodules vendored
View file

@ -61,3 +61,6 @@
[submodule "bundle/glsl"] [submodule "bundle/glsl"]
path = bundle/glsl path = bundle/glsl
url = https://github.com/vim-scripts/glsl.vim.git url = https://github.com/vim-scripts/glsl.vim.git
[submodule "bundle/indent-object"]
path = bundle/indent-object
url = https://github.com/michaeljsmith/vim-indent-object

1
bundle/indent-object Submodule

@ -0,0 +1 @@
Subproject commit 78fffa609b3e6b84ef01ee4c9aba6d7435d7b18e

5
vimrc
View file

@ -125,6 +125,9 @@ set swb=usetab "make :sb <filename> go to tabs too
"key mappings "key mappings
let mapleader = ',' let mapleader = ','
set hlsearch
map <leader>s :nohlsearch<CR>
map <leader>R :source ~/.vimrc<CR> map <leader>R :source ~/.vimrc<CR>
map <leader>t :CtrlP<CR> map <leader>t :CtrlP<CR>
map <leader>b :CtrlPBuffer<CR> map <leader>b :CtrlPBuffer<CR>
@ -135,7 +138,7 @@ map <leader>c :CoffeeCompile<CR>
command -nargs=1 C CoffeeCompile | :<args> command -nargs=1 C CoffeeCompile | :<args>
"session "session
nnoremap <leader>s :mksession!<CR> nnoremap <leader>S :mksession!<CR>
"Ack "Ack
nnoremap <leader>a :Ack<SPACE> nnoremap <leader>a :Ack<SPACE>