diff options
author | Tom Ryder <tom@sanctum.geek.nz> | 2020-04-05 22:18:42 +1200 |
---|---|---|
committer | Tom Ryder <tom@sanctum.geek.nz> | 2020-04-05 22:18:42 +1200 |
commit | b27e445dd9bddb8b7f0cd820cd97ee4661db99c8 (patch) | |
tree | 4f074cd72a21532e0866a69064ca60a395c1998b /vim/vimrc | |
parent | Merge branch 'release/v8.13.0' (diff) | |
parent | Update PGP key (diff) | |
download | dotfiles-b27e445dd9bddb8b7f0cd820cd97ee4661db99c8.tar.gz dotfiles-b27e445dd9bddb8b7f0cd820cd97ee4661db99c8.zip |
Merge branch 'release/v8.14.0'v8.14.0
* release/v8.14.0:
Update PGP key
Vim: Use more correct method of escaping :set RHS
Check for existence of 'colorcolumn' option
Diffstat (limited to 'vim/vimrc')
-rw-r--r-- | vim/vimrc | 14 |
1 files changed, 7 insertions, 7 deletions
@@ -99,7 +99,7 @@ scriptencoding utf-8 " list becomes MYVIM. " if exists('$MYVIM') && $MYVIM !=# '' - execute 'set runtimepath^='.argument#Escape(option#item#Escape($MYVIM, 1)) + execute 'set runtimepath^='.option#Escape(option#item#Escape($MYVIM, 1)) elseif &runtimepath !=# '' let $MYVIM = option#Split(&runtimepath)[0] endif @@ -133,7 +133,7 @@ command! -bang -bar -complete=dir -nargs=1 CreatePath " " <https://github.com/vim/vim/releases/tag/v8.1.0716> " -execute 'set viminfo+='.argument#Escape('n'.$MYVIM.'/viminfo') +execute 'set viminfo+='.option#Escape('n'.$MYVIM.'/viminfo') CreatePath $MYVIM " Speaking of recorded data in viminfo files, the default Vim limit of a mere @@ -179,7 +179,7 @@ set history=10000 " 'backupfullname', 'swapfilefullname' would have been clearer. " set backup -execute 'set backupdir^='.argument#Escape(option#item#Escape( +execute 'set backupdir^='.option#Escape(option#item#Escape( \ $MYVIM.'/backup'.(has#('patch-8.1.251') ? '//' : ''), \)) CreatePath! $MYVIM/backup @@ -219,7 +219,7 @@ endif " apply path#Create() to attempt to create the path, if needed. " execute 'set directory^=' - \.argument#Escape(option#item#Escape($MYVIM.'/swap//')) + \.option#Escape(option#item#Escape($MYVIM.'/swap//')) CreatePath! $MYVIM/swap " Keep tracked undo history for files permanently, in a dedicated cache @@ -238,7 +238,7 @@ CreatePath! $MYVIM/swap if has#('persistent_undo') set undofile execute 'set undodir^=' - \.argument#Escape(option#item#Escape($MYVIM.'/undo//')) + \.option#Escape(option#item#Escape($MYVIM.'/undo//')) CreatePath! $MYVIM/undo endif @@ -357,9 +357,9 @@ set dictionary^=/usr/share/dict/words let s:ref = $MYVIM.'/ref' try execute 'set dictionary^=' - \.argument#Escape(option#item#Escape(s:ref.'/dictionary.txt')) + \.option#Escape(option#item#Escape(s:ref.'/dictionary.txt')) execute 'set thesaurus^=' - \.argument#Escape(option#item#Escape(s:ref.'/thesaurus.txt')) + \.option#Escape(option#item#Escape(s:ref.'/thesaurus.txt')) catch /^Vim\%((\a\+)\)\=:E474:/ endtry |