diff options
| -rw-r--r-- | ftplugin/coffee.vim | 6 | ||||
| -rw-r--r-- | ftplugin/go.vim | 6 | ||||
| -rw-r--r-- | ftplugin/haskell.vim | 6 | ||||
| -rw-r--r-- | ftplugin/javascript.vim | 6 | ||||
| -rw-r--r-- | ftplugin/objc.vim | 6 | ||||
| -rw-r--r-- | ftplugin/python.vim | 6 | ||||
| -rw-r--r-- | ftplugin/ruby.vim | 6 | ||||
| -rw-r--r-- | ftplugin/rust.vim | 6 | ||||
| -rw-r--r-- | vimrc | 9 |
9 files changed, 3 insertions, 54 deletions
diff --git a/ftplugin/coffee.vim b/ftplugin/coffee.vim index fc06b0f..29c38be 100644 --- a/ftplugin/coffee.vim +++ b/ftplugin/coffee.vim @@ -7,11 +7,5 @@ setlocal softtabstop=2 setlocal shiftwidth=2 -" Don't preserve indentation on empty lines -inoremap <buffer> <CR> <CR> -nnoremap <buffer> o o -nnoremap <buffer> O O - - " Comment string setlocal commentstring=#\ %s diff --git a/ftplugin/go.vim b/ftplugin/go.vim index 29243ef..4f32aa1 100644 --- a/ftplugin/go.vim +++ b/ftplugin/go.vim @@ -16,12 +16,6 @@ nnoremap <buffer> <leader>cr :!go run %<cr> nnoremap <buffer> cdf :!go fmt %<cr> -" Don't preserve indentation on empty lines -inoremap <buffer> <CR> <CR> -nnoremap <buffer> o o -nnoremap <buffer> O O - - " Comment string setlocal commentstring=//\ %s diff --git a/ftplugin/haskell.vim b/ftplugin/haskell.vim index d393a45..6dad6bc 100644 --- a/ftplugin/haskell.vim +++ b/ftplugin/haskell.vim @@ -8,9 +8,3 @@ setlocal shiftwidth=4 setlocal textwidth=80 - - -" Don't preserve indentation on empty lines -inoremap <buffer> <CR> <CR> -nnoremap <buffer> o o -nnoremap <buffer> O O diff --git a/ftplugin/javascript.vim b/ftplugin/javascript.vim deleted file mode 100644 index fa8bd24..0000000 --- a/ftplugin/javascript.vim +++ /dev/null @@ -1,6 +0,0 @@ -" JavaScript vim settings - -" Don't preserve indentation on empty lines -inoremap <buffer> <CR> <CR> -nnoremap <buffer> o o -nnoremap <buffer> O O diff --git a/ftplugin/objc.vim b/ftplugin/objc.vim index 32e9437..8d7e976 100644 --- a/ftplugin/objc.vim +++ b/ftplugin/objc.vim @@ -5,12 +5,6 @@ setlocal softtabstop=4 setlocal shiftwidth=4 -" Don't preserve indentation on empty lines -inoremap <buffer> <CR> <CR> -nnoremap <buffer> o o -nnoremap <buffer> O O - - " Comment string call tcomment#DefineType('objc', '// %s') diff --git a/ftplugin/python.vim b/ftplugin/python.vim index 434ae8e..1c0d30b 100644 --- a/ftplugin/python.vim +++ b/ftplugin/python.vim @@ -10,12 +10,6 @@ setlocal shiftwidth=4 setlocal textwidth=79 -" Don't preserve indentation on empty lines -inoremap <buffer> <CR> <CR> -nnoremap <buffer> o o -nnoremap <buffer> O O - - " Quickly add a debug line nnoremap <buffer> <leader>gdo oimport ipdb; ipdb.set_trace()<Esc>_ nnoremap <buffer> <leader>gdO Oimport ipdb; ipdb.set_trace()<Esc>_ diff --git a/ftplugin/ruby.vim b/ftplugin/ruby.vim index e95b70f..cfdc0ca 100644 --- a/ftplugin/ruby.vim +++ b/ftplugin/ruby.vim @@ -7,12 +7,6 @@ setlocal softtabstop=2 setlocal shiftwidth=2 -" Don't preserve indentation on empty lines -inoremap <buffer> <CR> <CR> -nnoremap <buffer> o o -nnoremap <buffer> O O - - " Debugging nnoremap <buffer> Zd obyebug<Esc> nnoremap <buffer> ZD Obyebug<Esc> diff --git a/ftplugin/rust.vim b/ftplugin/rust.vim index 0b1f2ae..c45091f 100644 --- a/ftplugin/rust.vim +++ b/ftplugin/rust.vim @@ -7,11 +7,5 @@ setlocal softtabstop=4 setlocal shiftwidth=4 -" Don't preserve indentation on empty lines -inoremap <buffer> <CR> <CR> -nnoremap <buffer> o o -nnoremap <buffer> O O - - " Comment string setlocal commentstring=//\ %s @@ -429,6 +429,9 @@ " 2019.06.16: " * Disable modelines for CVE-2019-12735. " +" 2019.06.17: +" * Don't preserve indentation on empty lines. +" " Pathogen @@ -680,12 +683,6 @@ vnoremap <c-h> <esc>:update<cr>gv " Update all files and quit nnoremap ZA :xall<cr> -" Preserve indentation on empty lines -" http://stackoverflow.com/a/7413117 -inoremap <CR> <CR>x<BS> -nnoremap o ox<BS> -nnoremap O Ox<BS> - " Allow undo of Ctrl-u and Ctrl-w in insert mode " http://vim.wikia.com/wiki/Recover_from_accidental_Ctrl-U inoremap <c-u> <c-g>u<c-u> |