aboutsummaryrefslogtreecommitdiff
path: root/vim/vimrc
diff options
context:
space:
mode:
authorTom Ryder <tom@sanctum.geek.nz>2019-07-11 14:52:08 +1200
committerTom Ryder <tom@sanctum.geek.nz>2019-07-11 14:54:03 +1200
commitc139e8e0482c484fcb7115fe91bae668a51ea4bc (patch)
tree494eb3eb6188e2c202ff7dc7d40980129eacf492 /vim/vimrc
parentMerge branch 'release/v6.54.0' into develop (diff)
downloaddotfiles-c139e8e0482c484fcb7115fe91bae668a51ea4bc.tar.gz
dotfiles-c139e8e0482c484fcb7115fe91bae668a51ea4bc.zip
Avoid let-& syntax
Diffstat (limited to 'vim/vimrc')
-rw-r--r--vim/vimrc11
1 files changed, 4 insertions, 7 deletions
diff --git a/vim/vimrc b/vim/vimrc
index c3f21c03..5052ed61 100644
--- a/vim/vimrc
+++ b/vim/vimrc
@@ -323,7 +323,7 @@ endif
set spellfile&
execute 'set spellfile^='.escape#Arg(escape#Item(s:spellfile))
if exists('s:isfname')
- let &isfname = s:isfname
+ execute 'set isfname='.escape#Arg(s:isfname)
unlet s:isfname
endif
CreatePath $MYVIM/spell
@@ -439,11 +439,8 @@ set smarttab
"
" <https://github.com/vim/vim/releases/tag/v7.3.693>
"
-if has#('patch-7.3.693')
- set softtabstop=-1
-else
- let &softtabstop = &shiftwidth
-endif
+execute 'set softtabstop='
+ \ . escape#Arg(has#('patch-7.3.693') ? -1 : &shiftwidth)
" Relax traditional vi’s harsh standards over what regions of the buffer can
" be removed with backspace in insert mode. While this admittedly allows bad
@@ -916,7 +913,7 @@ endif
" <https://github.com/vim/vim/releases/tag/v7.4.108>
"
autocmd vimrc ColorScheme *
- \ let &cursorline = g:colors_name ==# 'sahara'
+ \ call colorscheme#UpdateCursorline(g:colors_name, ['sahara'])
" Use 'dark' as my default value for 'background', in the absence of an
" environment variable COLORFGBG or a response in v:termrbgresp that would set