aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTom Ryder <tom@sanctum.geek.nz>2018-05-28 10:16:56 +1200
committerTom Ryder <tom@sanctum.geek.nz>2018-05-28 10:16:56 +1200
commit9934c87434eec9add8d0ffbb72833b08e4edd4ad (patch)
tree7892ba34538590d17d8b59713afa708ba8b37b1b
parentd4598bd3e2ad10a65f94b1267b20404d2ccdf6af (diff)
parentf99e8c46ec955e09b396188c4ede6f649bde8f6b (diff)
downloaddotfiles-9934c87434eec9add8d0ffbb72833b08e4edd4ad.tar.gz
dotfiles-9934c87434eec9add8d0ffbb72833b08e4edd4ad.zip
Merge branch 'release/v0.34.0'v0.34.0
* release/v0.34.0: Bump VERSION Use script variable to keep showbreak setting
-rw-r--r--VERSION4
-rw-r--r--vim/plugin/copy_linebreak.vim5
2 files changed, 5 insertions, 4 deletions
diff --git a/VERSION b/VERSION
index 206fa15d..88a8e216 100644
--- a/VERSION
+++ b/VERSION
@@ -1,2 +1,2 @@
-tejr dotfiles v0.33.0
-Fri May 25 02:06:34 UTC 2018
+tejr dotfiles v0.34.0
+Sun May 27 22:13:33 UTC 2018
diff --git a/vim/plugin/copy_linebreak.vim b/vim/plugin/copy_linebreak.vim
index 9d241d5a..0924134c 100644
--- a/vim/plugin/copy_linebreak.vim
+++ b/vim/plugin/copy_linebreak.vim
@@ -17,7 +17,8 @@ let g:loaded_copy_linebreak = 1
" Enable copy-friendly linebreak options
function! s:CopyLinebreakEnable()
setlocal nolinebreak linebreak?
- setlocal showbreak=
+ let s:showbreak = &showbreak
+ set showbreak=
if exists('+breakindent')
setlocal nobreakindent
endif
@@ -26,7 +27,7 @@ endfunction
" Disable copy-friendly linebreak options
function! s:CopyLinebreakDisable()
setlocal linebreak linebreak?
- setlocal showbreak<
+ let &showbreak = s:showbreak
if exists('+breakindent')
setlocal breakindent<
endif