aboutsummaryrefslogtreecommitdiff
path: root/vim/vimrc
diff options
context:
space:
mode:
authorTom Ryder <tom@sanctum.geek.nz>2018-08-08 00:05:45 +1200
committerTom Ryder <tom@sanctum.geek.nz>2018-08-08 00:05:45 +1200
commitb1556e5af023f05dcfd4d4014e932ce55e882e4e (patch)
tree8f791914816c1821707a680a129790d2907fc77f /vim/vimrc
parentMerge branch 'release/v1.47.0' (diff)
parentCheck surround.vim actually loaded before unmap (diff)
downloaddotfiles-b1556e5af023f05dcfd4d4014e932ce55e882e4e.tar.gz
dotfiles-b1556e5af023f05dcfd4d4014e932ce55e882e4e.zip
Merge branch 'release/v1.48.0'v1.48.0
* release/v1.48.0: Check surround.vim actually loaded before unmap Check for 'cursorline' existence Add e() and v() wrappers Bind ,K in Vim buffers as a :helpgrep shortcut Improve a comment on HTML URL links Bind K in Vim help to jump to tag Revert "Use ^= instead of += for arbitrary tex..." Add ASM to Vim filetypes
Diffstat (limited to 'vim/vimrc')
-rw-r--r--vim/vimrc18
1 files changed, 10 insertions, 8 deletions
diff --git a/vim/vimrc b/vim/vimrc
index e9fbaf3f..be9c63ab 100644
--- a/vim/vimrc
+++ b/vim/vimrc
@@ -62,8 +62,10 @@ set comments=
set confirm
" Only turn on 'cursorline' if my colorscheme loaded
-if exists('g:colors_name') && g:colors_name ==# 'sahara'
- set cursorline
+if exists('+cursorline')
+ if exists('g:colors_name') && g:colors_name ==# 'sahara'
+ set cursorline
+ endif
endif
" Try to keep swapfiles in one system-appropriate dir
@@ -113,11 +115,11 @@ set lazyredraw
set linebreak
" Define extra 'list' display characters
-set listchars^=extends:> " Unwrapped text to screen right
-set listchars^=precedes:< " Unwrapped text to screen left
-set listchars^=tab:>- " Tab characters, preserve width
-set listchars^=trail:_ " Trailing spaces
-silent! set listchars^=nbsp:+ " Non-breaking spaces
+set listchars+=extends:> " Unwrapped text to screen right
+set listchars+=precedes:< " Unwrapped text to screen left
+set listchars+=tab:>- " Tab characters, preserve width
+set listchars+=trail:_ " Trailing spaces
+silent! set listchars+=nbsp:+ " Non-breaking spaces
" Don't allow setting options via buffer content
set nomodeline
@@ -127,7 +129,7 @@ set nrformats-=octal
" Options for file search with gf/:find
set path-=/usr/include " Let the C/C++ filetypes set that
-set path^=** " Search current directory's whole tree
+set path+=** " Search current directory's whole tree
" Don't show startup splash screen (I donated)
set shortmess+=I