Skip to content

Commit dde7a6b

Browse files
committed
more stuff
1 parent 9da7f7d commit dde7a6b

File tree

1 file changed

+13
-6
lines changed

1 file changed

+13
-6
lines changed

vimrc

Lines changed: 13 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,8 @@ Bundle 'tpope/vim-endwise'
2020
Bundle 'tpope/vim-markdown'
2121
Bundle 'tpope/vim-unimpaired'
2222
Bundle 'tpope/vim-repeat'
23+
" this one sets shiftwidth and tabstop automatically
24+
Bundle 'tpope/vim-sleuth'
2325
Bundle 'godlygeek/tabular'
2426
Bundle 'Valloric/YouCompleteMe'
2527
Bundle 'scrooloose/nerdcommenter'
@@ -33,10 +35,8 @@ Bundle 'mileszs/ack.vim'
3335
Bundle 'Raimondi/delimitMate'
3436
Bundle 'croaker/mustang-vim'
3537
Bundle 'telamon/vim-color-github'
36-
Bundle 'nvie/vim-flake8'
3738
Bundle 'alfredodeza/pytest.vim'
3839
Bundle 'mbbill/undotree'
39-
"Bundle 'sjl/Gundo.vim'
4040
Bundle 'matthias-guenther/hammer.vim'
4141
Bundle 'Spaceghost/vim-matchit'
4242
Bundle 'gregsexton/gitv'
@@ -48,7 +48,7 @@ Bundle 'bufexplorer.zip'
4848
" Check it
4949
Bundle 'michaeljsmith/vim-indent-object'
5050
Bundle 'sjl/clam.vim'
51-
Bundle 'suan/vim-instant-markdown'
51+
"Bundle 'suan/vim-instant-markdown'
5252
Bundle 'maxbrunsfeld/vim-yankstack'
5353
Bundle 'scrooloose/nerdtree'
5454
Bundle 'sgerrand/Conque-Shell'
@@ -57,7 +57,7 @@ Bundle 'spiiph/vim-space'
5757
Bundle 'airblade/vim-gitgutter'
5858
Bundle 'terryma/vim-multiple-cursors'
5959
Bundle 'xolox/vim-shell'
60-
Bundle 'Yggdroot/indentLine'
60+
"Bundle 'Yggdroot/indentLine'
6161
"Bundle 'kien/rainbow_parentheses'
6262
Bundle 'pydave/AsyncCommand'
6363

@@ -84,7 +84,6 @@ if !isdirectory(expand(&undodir))
8484
call mkdir(expand(&undodir), "p")
8585
endif
8686
if !isdirectory(expand(&backupdir))
87-
;echo a
8887
call mkdir(expand(&backupdir), "p")
8988
endif
9089
if !isdirectory(expand(&directory))
@@ -164,6 +163,8 @@ set tm=500
164163

165164
set splitright
166165

166+
set nrformats-=octal
167+
167168
"highlight word under cursor
168169
"autocmd CursorMoved * silent! exe printf("match Search /\\<%s\\>/", expand('<cword>'))
169170

@@ -241,7 +242,7 @@ inoremap <F1> <ESC>
241242
vnoremap <F1> <ESC>
242243
243244
" easily insert an escaped / on the search prompt
244-
cnoremap <expr> / getcmdtype() == '/' ? '\/' : '/'
245+
"cnoremap <expr> / getcmdtype() == '/' ? '\/' : '/'
245246

246247
" map control-backspace to delete the previous word in insert mode
247248
" imap <C-BS> <C-W>
@@ -250,6 +251,12 @@ inoremap <C-BS> <C-W>
250251
" and map control-delete to delete the next word in insert mode
251252
inoremap <C-Del> <C-O>dw
252253
254+
nnoremap & :&&<CR>
255+
xnoremap & :&&<CR>
256+
" Make Y consistent with C and D. See :help Y.
257+
nnoremap Y y$
258+
259+
253260
" ==================== CtrlP ====================
254261
" funty adds functions definitions mode to CtrlP
255262
let g:ctrlp_extensions = ['tag', 'funky']

0 commit comments

Comments
 (0)