aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTom Ryder <tom@sanctum.geek.nz>2019-01-15 00:06:26 +1300
committerTom Ryder <tom@sanctum.geek.nz>2019-01-15 00:06:26 +1300
commitc01074816e61cd349cec9275e3fa2d1023a09ecb (patch)
tree2039a2106dbbcef3d81e19a4e21b2499d18f137a
parent1c506ef8ed17e23206fa0a69112c9698c5f0d42b (diff)
parent11306b4b6cd2fed8bb5ecf661a3b7f1236c6e3d2 (diff)
downloaddotfiles-4.11.0.tar.gz
Merge branch 'release/v4.11.0'v4.11.0
* release/v4.11.0: Bump VERSION Break up some long conditions for readability Add setting for p flag to Vim 'formatoptions'
-rw-r--r--VERSION4
-rw-r--r--vim/vimrc9
2 files changed, 10 insertions, 3 deletions
diff --git a/VERSION b/VERSION
index 566fddaf..dca0777c 100644
--- a/VERSION
+++ b/VERSION
@@ -1,2 +1,2 @@
-tejr dotfiles v4.10.0
-Mon Jan 7 03:28:11 UTC 2019
+tejr dotfiles v4.11.0
+Mon Jan 14 11:06:26 UTC 2019
diff --git a/vim/vimrc b/vim/vimrc
index 724a32e7..d3a814f2 100644
--- a/vim/vimrc
+++ b/vim/vimrc
@@ -109,10 +109,17 @@ if has('folding')
endif
" Delete comment leaders when joining lines, if supported
-if v:version > 703 || v:version == 703 && has('patch541')
+if v:version > 703
+ \ || v:version == 703 && has('patch541')
set formatoptions+=j
endif
+" Don't break a single space after a period, if supported
+if v:version > 801
+ \ || v:version == 801 && has('patch728')
+ set formatoptions+=p
+endif
+
" If available, use GNU grep niceties for searching
if system('grep --version') =~# '^grep (GNU grep)'
set grepprg=grep\ -HnRs\ --exclude='.git*'