Commits

ZyX_I committed e075abe

@%aurum/vimdiff: Backing out 5e4abab79f76 and partly 9eb9d1212156.
It appers that though vimdiff uses vertical splits by default (“just like vim does” refers to this), :diffsplit uses horizontal. Hence using horizontal by default for consistency vim diffsplit (otherwise for consistency I will have to parse diffopt manually as it uses diffsplit sometimes)

  • Participants
  • Parent commits 5cc53c3

Comments (0)

Files changed (3)

File autoload/aurum/vimdiff.vim

     let curwinh=winheight(curwin)
     let curwinw=winwidth(curwin)
     let r=0
-    let vertical=(stridx(&diffopt, 'horizontal')==-1)
+    let vertical=(stridx(&diffopt, 'vertical')!=-1)
     for wc in vertical ? ['l', 'h'] : ['j', 'k']
         execute 'wincmd' wc
         if winnr()!=curwin && ((vertical)?(winheight(0)==curwinh):
     call s:_f.mapgroup.map('AuVimDiff', bufnr('%'))
     "▶2 Open subsequent revisions
     let i=1
-    let vertical=(stridx(&diffopt, 'horizontal')==-1)
+    let vertical=(stridx(&diffopt, 'vertical')!=-1)
     for rev in a:revs[1:]
         if !has_key(a:fdescr, i) || a:fdescr[i] is# 'added'
                     \            || a:fdescr[i] is# 'unknown'

File test/opts-vimdiffusewin.in

-:set diffopt+=horizontal
 :R silent edit nohglinesrev.lst
 :split
 :let g:aurum_vimdiffusewin=0
 :wincmd p
 :WW
 :bwipeout!
-:set diffopt-=horizontal
+:set diffopt+=vertical
 :vsplit
 :AuVimDiff
 :WW

File test/regression-vimdiff-nodiffoff.in

 :let g:aurum_vimdiffusewin=1
 :set hidden
 :set splitright
+:set diffopt+=vertical
 :R edit   emerged.lst
 :R vsplit ablines.lst
 :wincmd p