Preserve alternate buffer when processing realtime diff.

See airblade#238.
siathalysedI · Mar 10, 2015 · 3420cbf · 3420cbf
1 parent a86a32c
commit 3420cbf
Show file tree

Hide file tree

Showing 4 changed files with 21 additions and 1 deletion.
diff --git a/autoload/gitgutter/diff.vim b/autoload/gitgutter/diff.vim
@@ -30,7 +30,7 @@ function! gitgutter#diff#run_diff(realtime, use_external_grep)
       let buff_file .= '.'.extension
     endif
     let cmd .= 'git show '.blob_name.' > '.blob_file.' && '
-    execute 'silent write' buff_file
+    execute 'keepalt silent write' buff_file
   endif
 
   let cmd .= 'git diff --no-ext-diff --no-color -U0 '.g:gitgutter_diff_args.' -- '

diff --git a/test/helper.vim b/test/helper.vim
@@ -20,3 +20,8 @@ function! DumpGitDiffStaged(filename)
   call system('git diff --staged fixture.txt > '.a:filename.'.actual')
 endfunction
 
+function! Dump(text, filename)
+  let msg = type(a:text) == 1 ? split(a:text, '\n') : a:text
+  call writefile(msg, a:filename.'.actual', 'a')
+endfunction
+
diff --git a/test/keepAlt.expected b/test/keepAlt.expected
@@ -0,0 +1,3 @@
+buffer: fixture.txt
+altbuffer: 
+altbuffer: 
diff --git a/test/testKeepAlt.vim b/test/testKeepAlt.vim
@@ -0,0 +1,12 @@
+source helper.vim
+call Setup()
+
+enew
+execute "normal! \<C-^>"
+call Dump('buffer: '.bufname(''), 'keepAlt')
+call Dump('altbuffer: '.bufname('#'), 'keepAlt')
+
+normal ggx
+doautocmd CursorHold
+call Dump('altbuffer: '.bufname('#'), 'keepAlt')
+