From: Bob Hiestand <bob.hiestand@gmail.com>
Date: Tue, 27 Sep 2011 14:50:26 +0000 (-0500)
Subject: Switch from OverrideOption to execution context.
X-Git-Tag: v1.99.44~3
X-Git-Url: https://repo.or.cz/w/vcscommand.git/commitdiff_plain/0f19374d9ccc5c15bec0b004eb7b7c428c8c5667

Switch from OverrideOption to execution context.
---

diff --git a/plugin/vcscommand.vim b/plugin/vcscommand.vim
index fa1022d..0a177c7 100644
--- a/plugin/vcscommand.vim
+++ b/plugin/vcscommand.vim
@@ -1013,11 +1013,11 @@ function! s:VCSVimDiff(...)
 				diffthis
 				let t:vcsCommandVimDiffScratchList = [resultBuffer]
 				" If no split method is defined, cheat, and set it to vertical.
+				call s:VCSCommandUtility.pushContext({'VCSCommandSplit': orientation})
 				try
-					call s:OverrideOption('VCSCommandSplit', orientation)
 					let resultBuffer = s:VCSReview(a:2)
 				finally
-					call s:OverrideOption('VCSCommandSplit')
+					call s:VCSCommandUtility.popContext()
 				endtry
 				if resultBuffer < 0
 					echomsg 'Can''t open revision ' . a:1
@@ -1027,22 +1027,16 @@ function! s:VCSVimDiff(...)
 				diffthis
 				let t:vcsCommandVimDiffScratchList += [resultBuffer]
 			else
-				" Add new buffer
-				call s:OverrideOption('VCSCommandEdit', 'split')
+				" Add new buffer.  Force splitting behavior, otherwise why use vimdiff?
+				call s:VCSCommandUtility.pushContext({'VCSCommandEdit': 'split', 'VCSCommandSplit': orientation})
 				try
-					" Force splitting behavior, otherwise why use vimdiff?
-					call s:OverrideOption('VCSCommandSplit', orientation)
-					try
-						if(a:0 == 0)
-							let resultBuffer = s:VCSReview()
-						else
-							let resultBuffer = s:VCSReview(a:1)
-						endif
-					finally
-						call s:OverrideOption('VCSCommandSplit')
-					endtry
+					if(a:0 == 0)
+						let resultBuffer = s:VCSReview()
+					else
+						let resultBuffer = s:VCSReview(a:1)
+					endif
 				finally
-					call s:OverrideOption('VCSCommandEdit')
+					call s:VCSCommandUtility.popContext()
 				endtry
 				if resultBuffer < 0
 					echomsg 'Can''t open current revision'