From 27b079d226d52e67b6377ff01b6eb66cc80efa3d Mon Sep 17 00:00:00 2001 From: Bob Hiestand Date: Mon, 5 Dec 2011 10:14:03 -0600 Subject: [PATCH] don't restore cursorbind if it doesn't exist --- plugin/vcscommand.vim | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/plugin/vcscommand.vim b/plugin/vcscommand.vim index 1ea79b6..1992b18 100644 --- a/plugin/vcscommand.vim +++ b/plugin/vcscommand.vim @@ -1081,9 +1081,11 @@ function! s:VCSVimDiff(...) \ . '|call setbufvar('.originalBuffer.', ''&foldmethod'', '''.getbufvar(originalBuffer, '&foldmethod').''')' \ . '|call setbufvar('.originalBuffer.', ''&foldlevel'', '''.getbufvar(originalBuffer, '&foldlevel').''')' \ . '|call setbufvar('.originalBuffer.', ''&scrollbind'', '.getbufvar(originalBuffer, '&scrollbind').')' - \ . '|call setbufvar('.originalBuffer.', ''&cursorbind'', '.getbufvar(originalBuffer, '&cursorbind').')' \ . '|call setbufvar('.originalBuffer.', ''&wrap'', '.getbufvar(originalBuffer, '&wrap').')' - \ . '|if &foldmethod==''manual''|execute ''normal! zE''|endif' + if has('cursorbind') + let t:vcsCommandVimDiffRestoreCmd .= '|call setbufvar('.originalBuffer.', ''&cursorbind'', '.getbufvar(originalBuffer, '&cursorbind').')' + endif + let t:vcsCommandVimDiffRestoreCmd .= '|if &foldmethod==''manual''|execute ''normal! zE''|endif' diffthis wincmd w else -- 2.11.4.GIT