On Mi, 12 Sep 2018, Bram Moolenaar wrote:
>
> Igor Forca wrote:
>
> > Christian, Tony,
> > if I understand correctly there are actually two problems. First like I
> > have described and second one is that internal diff should be used starting
> > v8.1_0360.
> >
> > I did the following:
> > a) I started gVim:
> > c:\Programs\Vim\vim81>c:\programs\vim\vim81\gvim -u NONE
> >
> > b) Checked which scripts are loaded at startup:
> > :scriptnames
> > and the output is:
> > 1: c:\programs\vim\vim81\menu.vim
> > 2: c:\programs\vim\vim81\lang\menu_sl_si.cp1250.vim
> > 3: c:\programs\vim\vim81\autoload\paste.vim
> >
> > This is fine, my _vimrc file was not loaded, just
> > pure vim files.
> >
> > c) Checked what is default diffopt value:
> > :set diffopt?
> > and output is:
> > diffopt=internal,filler
> >
> > d) Executing commands:
> > :cd c:\aaa
> > :e a.txt
> > :vert diffsp b.txt
> >
> > and I am getting the "E959: Invalid diff format".
>
> Try doing this here:
> :verbose set diffopt?
>
> Probably an autocommand for ".txt" changes 'diffopt'.
> Also try:
> :20verbose diffupdate
>
> > e) Executing:
> > :set diffopt+=internal
> > pressing enter and diff is working correctly!!!
> >
> > f) Rechecking diffopt
> > :set diffopt?
> > and output is:
> > diffopt=internal,filler
> >
> > g) Just in case checking diffexpr
> > :set diffexpr?
> > and output is:
> > diffexpr=
Hm, looks like the default is not correct yet. I think we need this
patch:
diff --git a/src/diff.c b/src/diff.c
index 4c0792baa..89d28bb71 100644
--- a/src/diff.c
+++ b/src/diff.c
@@ -31,7 +31,7 @@ static int diff_busy = FALSE; /* ex_diffgetput() is
busy */
#define DIFF_VERTICAL 16 // vertical splits
#define DIFF_HIDDEN_OFF 32 // diffoff when hidden
#define DIFF_INTERNAL 64 // use internal xdiff algorithm
-static int diff_flags = DIFF_FILLER;
+static int diff_flags = DIFF_FILLER | DIFF_INTERNAL;
static long diff_algorithm = 0;
However I still don't understand why using cygwins diff.exe fails.
Best,
Christian
--
Wen die Götter lieben, der stirbt jung.
-- Plautus
--
--
You received this message from the "vim_dev" maillist.
Do not top-post! Type your reply below the text you are replying to.
For more information, visit http://www.vim.org/maillist.php
---
You received this message because you are subscribed to the Google Groups
"vim_dev" group.
To unsubscribe from this group and stop receiving emails from it, send an email
to [email protected].
For more options, visit https://groups.google.com/d/optout.
