made LinediffMerge & LinediffPick work

Author: hcgraf

autoload/linediff.vim

@@ -34,6 +34,9 @@ endfunction
 
 function! linediff#LinediffReset(bang)
   let force = a:bang == '!'
+  augroup LinediffAug
+  autocmd!
+  augroup END
   for dfr in s:differ
     call dfr.CloseAndReset(force)
   endfor
@@ -48,7 +51,7 @@ function! linediff#LinediffMerge()
   endif
 
   let [top_area, bottom_area] = areas
-  let [mfrom, mto] = [top_area[0]-1, bottom_area[1]+1]
+  let [mfrom, mto] = [top_area[0] - 1, bottom_area[1] + 1]
 
   call linediff#Linediff(top_area[0],    top_area[1],    {'is_merge': 1, 'merge_from': mfrom, 'merge_to': mto, 'label': top_area[2]})
   call linediff#Linediff(bottom_area[0], bottom_area[1], {'is_merge': 1, 'merge_from': mfrom, 'merge_to': mto, 'label': bottom_area[2]})
@@ -81,6 +84,7 @@ function! s:PerformDiff()
     let &diffopt = g:linediff_diffopt
   endif
 
+  augroup LinediffAug
   call s:differ[0].CreateDiffBuffer(g:linediff_first_buffer_command)
   autocmd BufUnload <buffer> silent call linediff#LinediffReset('')
 
@@ -89,6 +93,7 @@ function! s:PerformDiff()
     call dfr.CreateDiffBuffer(g:linediff_further_buffer_command)
     autocmd BufUnload <buffer> silent call linediff#LinediffReset('')
   endfor
+  augroup END
 
   let l:swb_old = &switchbuf
   set switchbuf=useopen,usetab

autoload/linediff/differ.vim

@@ -50,13 +50,11 @@ function! linediff#differ#Init(from, to, options) dict
   let self.from     = a:from
   let self.to       = a:to
 
-  if has_key(a:options, 'is_merge')
-    let self.is_merge = a:options.is_merge
-  endif
-
-  if has_key(a:options, 'label')
-    let self.label = a:options.label
-  endif
+  for k in keys(a:options)
+    if has_key(self, k)
+      let self[k] = a:options[k]
+    endif
+  endfor
 
   call self.SetupSigns()
 
@@ -187,13 +185,13 @@ function! linediff#differ#SetupDiffBuffer() dict
     exe "set filetype=" . self.filetype
     setlocal bufhidden=wipe
 
-    autocmd BufWrite <buffer> silent call b:differ.UpdateOriginalBuffer()
+    autocmd LinediffAug BufWrite <buffer> silent call b:differ.UpdateOriginalBuffer()
   else " g:linediff_buffer_type == 'scratch'
     silent exec 'keepalt file ' . escape(description, '[ ')
     exe "set filetype=" . self.filetype
     set nomodified
 
-    autocmd BufWriteCmd <buffer> silent call b:differ.UpdateOriginalBuffer()
+    autocmd LinediffAug BufWriteCmd <buffer> silent call b:differ.UpdateOriginalBuffer()
   endif
 endfunction
 
@@ -271,6 +269,9 @@ function! linediff#differ#UpdateOtherDiffer(delta, other) dict
 
     call a:other.SetupSigns()
   endif
+  if self.is_merge && a:other.is_merge
+    let a:other.merge_to = a:other.merge_to + a:delta
+  endif
 endfunction
 
 " Was this buffer created from a merge area?