diff options
| author | Anatolii Sakhnik <sakhnik@gmail.com> | 2018-12-02 22:58:07 +0200 |
|---|---|---|
| committer | Anatolii Sakhnik <sakhnik@gmail.com> | 2018-12-09 19:45:56 +0200 |
| commit | cf1ffa91667a482c6355f5999b9e97ccc0b4126a (patch) | |
| tree | 0b30423f48fcd3ff19afe6142ee66db5f31cf7d3 /src/nvim/fileio.c | |
| parent | 67c5bc1ac082236c0a36c785619987b9462aa89a (diff) | |
| download | rneovim-cf1ffa91667a482c6355f5999b9e97ccc0b4126a.tar.gz rneovim-cf1ffa91667a482c6355f5999b9e97ccc0b4126a.tar.bz2 rneovim-cf1ffa91667a482c6355f5999b9e97ccc0b4126a.zip | |
vim-patch:8.1.0360: using an external diff program is slow and inflexible
Problem: Using an external diff program is slow and inflexible.
Solution: Include the xdiff library. (Christian Brabandt)
Use it by default.
https://github.com/vim/vim/commit/e828b7621cf9065a3582be0c4dd1e0e846e335bf
vim-patch:8.1.0360
vim-patch:8.1.0364
vim-patch:8.1.0366
vim-patch:8.1.0370
vim-patch:8.1.0377
vim-patch:8.1.0378
vim-patch:8.1.0381
vim-patch:8.1.0396
vim-patch:8.1.0432
Diffstat (limited to 'src/nvim/fileio.c')
| -rw-r--r-- | src/nvim/fileio.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/nvim/fileio.c b/src/nvim/fileio.c index 7e8a7d1a35..8e5455bc67 100644 --- a/src/nvim/fileio.c +++ b/src/nvim/fileio.c @@ -1739,13 +1739,13 @@ failed: close(0); #ifndef WIN32 // On Unix, use stderr for stdin, makes shell commands work. - ignored = dup(2); + vim_ignored = dup(2); #else // On Windows, use the console input handle for stdin. HANDLE conin = CreateFile("CONIN$", GENERIC_READ | GENERIC_WRITE, FILE_SHARE_READ, (LPSECURITY_ATTRIBUTES)NULL, OPEN_EXISTING, 0, (HANDLE)NULL); - ignored = _open_osfhandle(conin, _O_RDONLY); + vim_ignored = _open_osfhandle(conin, _O_RDONLY); #endif } |