ZyX_I avatar ZyX_I committed 6604476 Merge

Merge

Comments (0)

Files changed (3)

autoload/aurum/vimdiff.vim

     let curwinh=winheight(curwin)
     let curwinw=winwidth(curwin)
     let r=0
-    let vertical=(stridx(&diffopt, 'vertical')!=-1)
+    let vertical=(stridx(&diffopt, 'horizontal')==-1)
     for wc in vertical ? ['l', 'h'] : ['j', 'k']
         execute 'wincmd' wc
         if winnr()!=curwin && ((vertical)?(winheight(0)==curwinh):

test/opts-vimdiffusewin.in

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

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
Tip: Filter by directory path e.g. /media app.js to search for public/media/app.js.
Tip: Use camelCasing e.g. ProjME to search for ProjectModifiedEvent.java.
Tip: Filter by extension type e.g. /repo .js to search for all .js files in the /repo directory.
Tip: Separate your search with spaces e.g. /ssh pom.xml to search for src/ssh/pom.xml.
Tip: Use ↑ and ↓ arrow keys to navigate and return to view the file.
Tip: You can also navigate files with Ctrl+j (next) and Ctrl+k (previous) and view the file with Ctrl+o.
Tip: You can also navigate files with Alt+j (next) and Alt+k (previous) and view the file with Alt+o.