Re: When using diff I am getting "E959: Invalid diff format" in master gVim on Windows

2018-09-12 Fir de Conversatie Igor Forca
Bram, I did as requested. Executing command :verbose set diffopt? diffexpr? right after :vert diffsp b.txt and output is: diffopt=internal,filler diffexpr= -- -- You received this message from the "vim_dev" maillist. Do not top-post! Type your reply below the text you are replying to. For

Re: [patch] has('patch-8.1.0') returns 0

2018-09-12 Fir de Conversatie Tony Mechelynck
On Thu, Sep 13, 2018 at 7:32 AM Tony Mechelynck wrote: > > On Thu, Sep 13, 2018 at 6:42 AM h_east wrote: > > > > Hi Bram and developers, > > > > :echo has('patch-8.1.0') > > 0 > > > > This should return 1. > > A patch attached. > > > > NOTE: > > This issue was reported by Takuya Fujiwara. > > >

Re: [patch] has('patch-8.1.0') returns 0

2018-09-12 Fir de Conversatie Tony Mechelynck
On Thu, Sep 13, 2018 at 6:42 AM h_east wrote: > > Hi Bram and developers, > > :echo has('patch-8.1.0') > 0 > > This should return 1. > A patch attached. > > NOTE: > This issue was reported by Takuya Fujiwara. > > -- > Best regards, > Hirohito Higashi (h_east) I disagree. There never was a patch

[patch] has('patch-8.1.0') returns 0

2018-09-12 Fir de Conversatie h_east
Hi Bram and developers, :echo has('patch-8.1.0') 0 This should return 1. A patch attached. NOTE: This issue was reported by Takuya Fujiwara. -- Best regards, Hirohito Higashi (h_east) -- -- You received this message from the "vim_dev" maillist. Do not top-post! Type your reply below the

Re: Patch 8.1.0374

2018-09-12 Fir de Conversatie Nazri Ramliy
On Thu, Sep 13, 2018 at 5:16 AM Bram Moolenaar wrote: > Patch 8.1.0374 > Problem:Moving the cursor is slow when 'relativenumber' is set. > Solution: Only redraw the number column, not all lines. This is great! Thanks! Although one shouldn't get into the habit of holding down j/k keys to

Re: New internal diff and FilterWritePre and FilterWritePost autocommand events

2018-09-12 Fir de Conversatie Rick Howe
Hi, > > > Any thoughts on this? > > > > How about using an OptionSet autocommand? I haven't tried this: > > > > au OptionSet diff if | setlocal syn=OFF | endif > > In some but not in all cases. For example, if I run vimdiff as part > of the "git difftool" command, the OptionSet

Re: Patch 8.1.0374

2018-09-12 Fir de Conversatie Tony Mechelynck
On Wed, Sep 12, 2018 at 11:16 PM Bram Moolenaar wrote: > > > Patch 8.1.0374 > Problem:Moving the cursor is slow when 'relativenumber' is set. > Solution: Only redraw the number column, not all lines. > Files: src/screen.c, src/move.c I just noticed the following message in Huge, Big

Patch 8.1.0374

2018-09-12 Fir de Conversatie Bram Moolenaar
Patch 8.1.0374 Problem:Moving the cursor is slow when 'relativenumber' is set. Solution: Only redraw the number column, not all lines. Files: src/screen.c, src/move.c *** ../vim-8.1.0373/src/screen.c2018-09-12 21:52:14.323799725 +0200 --- src/screen.c2018-09-12

Patch 8.1.0373

2018-09-12 Fir de Conversatie Bram Moolenaar
Patch 8.1.0373 (after 8.1.0372) Problem:Screen updating still slow when 'cursorline' is set. Solution: Fix setting last_cursorline. Files: src/move.c *** ../vim-8.1.0372/src/move.c 2018-09-12 21:52:14.323799725 +0200 --- src/move.c 2018-09-12 22:21:50.03301 +0200

Re: Patch 8.1.0372

2018-09-12 Fir de Conversatie Bram Moolenaar
I wrote: > > Patch 8.1.0372 > > Problem:Screen updating slow when 'cursorline' is set. > > Solution: Only redraw the old and new cursor line, not all lines. > > Files: src/edit.c, src/move.c, src/screen.c, src/proto/screen.pro > > This is a bit of a simplistic solution. Let me

Re: Patch 8.1.0372

2018-09-12 Fir de Conversatie Bram Moolenaar
I wrote: > Patch 8.1.0372 > Problem:Screen updating slow when 'cursorline' is set. > Solution: Only redraw the old and new cursor line, not all lines. > Files:src/edit.c, src/move.c, src/screen.c, src/proto/screen.pro This is a bit of a simplistic solution. Let me know if

Re: New internal diff and FilterWritePre and FilterWritePost autocommand events

2018-09-12 Fir de Conversatie Gary Johnson
On 2018-09-12, Bram Moolenaar wrote: > Gary Johnson wrote: > > > When I diff a syntax-highlighted buffer, the diff highlighting often > > conflicts with the syntax highlighting so that some text has the > > same foreground and background colors and becomes impossible to > > read. > > > > I have

Re: When using diff I am getting "E959: Invalid diff format" in master gVim on Windows

2018-09-12 Fir de Conversatie Christian Brabandt
On Mi, 12 Sep 2018, Christian Brabandt wrote: > > On Mi, 12 Sep 2018, Bram Moolenaar wrote: > > > > However I still don't understand why using cygwins diff.exe fails. > > > > I suspect the ED style diff parsing was changed in a way it fails for > > some diff programs. > > But how, if both

Patch 8.1.0372

2018-09-12 Fir de Conversatie Bram Moolenaar
Patch 8.1.0372 Problem:Screen updating slow when 'cursorline' is set. Solution: Only redraw the old and new cursor line, not all lines. Files: src/edit.c, src/move.c, src/screen.c, src/proto/screen.pro *** ../vim-8.1.0371/src/edit.c 2018-08-08 22:08:28.326846653 +0200 ---

Re: When using diff I am getting "E959: Invalid diff format" in master gVim on Windows

2018-09-12 Fir de Conversatie Christian Brabandt
On Mi, 12 Sep 2018, Bram Moolenaar wrote: > > However I still don't understand why using cygwins diff.exe fails. > > I suspect the ED style diff parsing was changed in a way it fails for > some diff programs. But how, if both diff programs return exactly the same output? I did a couple of

Re: New internal diff and FilterWritePre and FilterWritePost autocommand events

2018-09-12 Fir de Conversatie Bram Moolenaar
Gary Johnson wrote: > When I diff a syntax-highlighted buffer, the diff highlighting often > conflicts with the syntax highlighting so that some text has the > same foreground and background colors and becomes impossible to > read. > > I have worked around this problem with the following

Re: New internal diff and FilterWritePre and FilterWritePost autocommand events

2018-09-12 Fir de Conversatie Christian Brabandt
On Mi, 12 Sep 2018, Gary Johnson wrote: > When I diff a syntax-highlighted buffer, the diff highlighting often > conflicts with the syntax highlighting so that some text has the > same foreground and background colors and becomes impossible to > read. > > I have worked around this problem with

Patch 8.1.0371

2018-09-12 Fir de Conversatie Bram Moolenaar
Patch 8.1.0371 Problem:Argument types for select() may be wrong. Solution: Use a configure macro. (Tobias Ulmer) Files: src/config.h.in, src/configure.ac, src/auto/configure, src/os_unix.c *** ../vim-8.1.0370/src/config.h.in 2018-05-13 15:37:01.0 +0200 ---

New internal diff and FilterWritePre and FilterWritePost autocommand events

2018-09-12 Fir de Conversatie Gary Johnson
When I diff a syntax-highlighted buffer, the diff highlighting often conflicts with the syntax highlighting so that some text has the same foreground and background colors and becomes impossible to read. I have worked around this problem with the following autocommand. au FilterWritePost *

Re: select() prototype breaks vim on NetBSD, with fix

2018-09-12 Fir de Conversatie Bram Moolenaar
Tobias Ulmer wrote: > vim compiles but is unusable on NetBSD/sparc64 (extreme lag, high cpu). > > Martin Husemann figured this is due to the wrong select() being called, > and provided a workaround here: > http://gnats.netbsd.org/cgi-bin/query-pr-single.pl?number=53296 > > It works, but

Patch 8.1.0370

2018-09-12 Fir de Conversatie Bram Moolenaar
Patch 8.1.0370 Problem:Not using internal diff if 'diffopt' is not changed. Solution: Correct initialization of diff_flags. (Christian Brabandt) Files: src/diff.c *** ../vim-8.1.0369/src/diff.c 2018-09-10 17:50:32.713306941 +0200 --- src/diff.c 2018-09-12 17:56:59.002582092 +0200

Re: When using diff I am getting "E959: Invalid diff format" in master gVim on Windows

2018-09-12 Fir de Conversatie Bram Moolenaar
Christian Brabandt wrote: > 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 intdiff_busy = FALSE; /*

select() prototype breaks vim on NetBSD, with fix

2018-09-12 Fir de Conversatie Tobias Ulmer
Hi, vim compiles but is unusable on NetBSD/sparc64 (extreme lag, high cpu). Martin Husemann figured this is due to the wrong select() being called, and provided a workaround here: http://gnats.netbsd.org/cgi-bin/query-pr-single.pl?number=53296 It works, but looking at this mess I couldn't

Re: RFC: Signature help/argument hints in a second popup menu

2018-09-12 Fir de Conversatie boris . staletic
On Saturday, December 23, 2017 at 12:23:43 PM UTC+1, Ben Jackson wrote: > Hi Bram and community, > > I have prepared a brief request for comments on a proposed new Vim feature > which I am personally very keen on, but would like to gauge the appetite for > it and the thoughts of the community

Re: When using diff I am getting "E959: Invalid diff format" in master gVim on Windows

2018-09-12 Fir de Conversatie Bram Moolenaar
Igor Forca wrote: > I did as instructed. > > Command :verbose set diffopt? > outputs: > > diffopt=internal,filler I forgot to ask about 'diffexpr': :verbose set diffopt? diffexpr? Anyway, it appears Christian spotted a relevant problem. > Command :20verbose diffupdate > outputs:

Re: When using diff I am getting "E959: Invalid diff format" in master gVim on Windows

2018-09-12 Fir de Conversatie Christian Brabandt
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: > >

Re: When using diff I am getting "E959: Invalid diff format" in master gVim on Windows

2018-09-12 Fir de Conversatie Igor Forca
Bram, I did as instructed. Command :verbose set diffopt? outputs: diffopt=internal,filler Command :20verbose diffupdate outputs: ~ ~ "b.txt" 1 line, 5 characters E959: Invalid diff format. diffopt=internal,filler Calling shell to execute: "diff -a --binary

Re: When using diff I am getting "E959: Invalid diff format" in master gVim on Windows

2018-09-12 Fir de Conversatie Bram Moolenaar
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: >

Re: When using diff I am getting "E959: Invalid diff format" in master gVim on Windows

2018-09-12 Fir de Conversatie Igor Forca
Actually I really prefer internal diff, it is much faster. In my $MYVIMRC file I have set: :set diffopt+=internal restarted vim in normal (to accept my vimrc file) and everything now works fine. Checking settings: :set diffopt? diffexpr? and output is: diffopt=internal,filler diffexpr= -- --

Re: When using diff I am getting "E959: Invalid diff format" in master gVim on Windows

2018-09-12 Fir de Conversatie Igor Forca
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

Re: When using diff I am getting "E959: Invalid diff format" in master gVim on Windows

2018-09-12 Fir de Conversatie Igor Forca
Christian, it looks output is the same. C:\aaa>c:\Programs\Vim\vim81\diff -a --binary a.txt b.txt > c:\aaa\vim_diff.txt C:\aaa>c:\cygwin\bin\diff.exe -a --binary a.txt b.txt > cywin_diff.txt C:\aaa>md5sum vim_diff.txt cywin_diff.txt 7139c1d572232d794184ad7804ba3d21 *vim_diff.txt

Re: When using diff I am getting "E959: Invalid diff format" in master gVim on Windows

2018-09-12 Fir de Conversatie Christian Brabandt
On Mi, 12 Sep 2018, Igor Forca wrote: > Christian, > 1. TEST WITH SETTING DIFF INTERNAL > Started: c:\programs\vim\vim81\gvim -u NONE > :set diffopt+=internal diffexpr= > > Repeated the steps from first post and it works fine! > > Re-testing without "set" command and it still gets the error

Re: When using diff I am getting "E959: Invalid diff format" in master gVim on Windows

2018-09-12 Fir de Conversatie Tony Mechelynck
On Wed, Sep 12, 2018 at 11:19 AM Igor Forca wrote: > > Now I set > :set diffopt+=internal diffexpr= > in $VIMRC file, > restarted the gVim and now it works fine. > > Still it is interesting gVim v8.1.0359 works fine without above setting, > but v8.1.0366 only works if above setting is set. Until

Re: When using diff I am getting "E959: Invalid diff format" in master gVim on Windows

2018-09-12 Fir de Conversatie Igor Forca
Now I set :set diffopt+=internal diffexpr= in $VIMRC file, restarted the gVim and now it works fine. Still it is interesting gVim v8.1.0359 works fine without above setting, but v8.1.0366 only works if above setting is set. -- -- You received this message from the "vim_dev" maillist. Do not

Re: When using diff I am getting "E959: Invalid diff format" in master gVim on Windows

2018-09-12 Fir de Conversatie Igor Forca
Christian, 1. TEST WITH SETTING DIFF INTERNAL Started: c:\programs\vim\vim81\gvim -u NONE :set diffopt+=internal diffexpr= Repeated the steps from first post and it works fine! Re-testing without "set" command and it still gets the error (as expected). 2. DIFF OUTPUT

Re: When using diff I am getting "E959: Invalid diff format" in master gVim on Windows

2018-09-12 Fir de Conversatie Igor Forca
Now I have additionally ping-ponged the problem. I also have Cygwin installed on my computer and I see diff.exe is also available in C:\cygwin\bin\diff.exe If I rename the C:\cygwin directory to C:\_cygwin and repeat steps from first post then gVim is working fine also with v8.1_0366 Renaming

Re: When using diff I am getting "E959: Invalid diff format" in master gVim on Windows

2018-09-12 Fir de Conversatie Christian Brabandt
On Mi, 12 Sep 2018, Igor Forca wrote: > Additional test as Christian suggested. > I did: > 1. Started gVim with > c:\programs\vim\vim81\gvim -u NONE -V20c:\aaa\vim.log > > 2. Typed in command: > :set diffopt-=internal > > 3. Repeated the steps from first post and getting the same error

Re: When using diff I am getting "E959: Invalid diff format" in master gVim on Windows

2018-09-12 Fir de Conversatie Igor Forca
I am attaching the debug info that I got using the command: c:\programs\vim\vim81\gvim -u NONE -V20c:\aaa\vim.log and repeating the steps from first post. -- -- 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

Re: When using diff I am getting "E959: Invalid diff format" in master gVim on Windows

2018-09-12 Fir de Conversatie Igor Forca
I have ping-ponged down. Version v8.1.0359 from: https://github.com/vim/vim-win32-installer/releases/download/v8.1.0359/gvim_8.1.0359_x64.zip WORKS FINE. Version v8.1.0366 from: https://github.com/vim/vim-win32-installer/releases/download/v8.1.0366/gvim_8.1.0366_x64.zip PRODUCES ERROR There

Re: When using diff I am getting "E959: Invalid diff format" in master gVim on Windows

2018-09-12 Fir de Conversatie Christian Brabandt
On Mi, 12 Sep 2018, Igor Forca wrote: > Hi, > I created two identical files a.txt with content: > aaa > > and b.txt with content: > bbb > > I have downloaded > https://github.com/vim/vim-win32-installer/releases/download/v8.1.0369/gvim_8.1.0369_x64.zip > so latest master and installed on

When using diff I am getting "E959: Invalid diff format" in master gVim on Windows

2018-09-12 Fir de Conversatie Igor Forca
Hi, I created two identical files a.txt with content: aaa and b.txt with content: bbb I have downloaded https://github.com/vim/vim-win32-installer/releases/download/v8.1.0369/gvim_8.1.0369_x64.zip so latest master and installed on Windows 7. Then I opened Command Prompt and: