# HG changeset patch # User Meredith Howard # Date 1505432386 14400 # Node ID f8985ae54969148f2623ecd2cc2140e0f5191745 # Parent 383628663fd58a6ca27f6efa88ed53b1eb97a993 avoid abbreviated options diff --git a/.vim/autoload/vimrc.vim b/.vim/autoload/vimrc.vim --- a/.vim/autoload/vimrc.vim +++ b/.vim/autoload/vimrc.vim @@ -4,9 +4,9 @@ endfunc func! vimrc#AutoFmtToggle() abort if &formatoptions =~ 'a' - setl fo-=a | echo '-a' + setl formatoptions-=a | echo '-a' else - setl fo+=a | echo '+a' + setl formatoptions+=a | echo '+a' endif endfunc @@ -50,6 +50,6 @@ func! vimrc#VundleInstallAndBegin() abor echo "Installed Vundle, run :PluginInstall if desired" endif - let &rtp .= ',' . bundlepath . '/vundle' + let &runtimepath .= ',' . bundlepath . '/vundle' call vundle#begin(bundlepath) endfunc diff --git a/.vimrc b/.vimrc --- a/.vimrc +++ b/.vimrc @@ -162,8 +162,8 @@ endif set linebreak set showbreak=ยป\ if exists('&breakindent') - set bri - set briopt+=sbr + set breakindent + set breakindentopt+=sbr endif set virtualedit=block