diff options
| author | James McCoy <jamessan@jamessan.com> | 2016-12-12 15:05:15 -0500 |
|---|---|---|
| committer | James McCoy <jamessan@jamessan.com> | 2016-12-27 14:10:26 -0500 |
| commit | a86d8b4088d21b784c1b72a03db9c22dcae67d00 (patch) | |
| tree | cf2018c0396db9bc749fec5302138dc46869ba3d | |
| parent | 1e49cf6f233f6681a5a269bba84a09d8f8dbac22 (diff) | |
| download | rneovim-a86d8b4088d21b784c1b72a03db9c22dcae67d00.tar.gz rneovim-a86d8b4088d21b784c1b72a03db9c22dcae67d00.tar.bz2 rneovim-a86d8b4088d21b784c1b72a03db9c22dcae67d00.zip | |
vim-patch:7.4.1882
Problem: Check for line break at end of line wrong. (Dominique Pelle)
Solution: Correct the logic.
https://github.com/vim/vim/commit/b37662a0fbb952838fca87aff4d26b596030b67b
| -rw-r--r-- | src/nvim/quickfix.c | 4 | ||||
| -rw-r--r-- | src/nvim/version.c | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/src/nvim/quickfix.c b/src/nvim/quickfix.c index 34918e4134..9703d8763a 100644 --- a/src/nvim/quickfix.c +++ b/src/nvim/quickfix.c @@ -556,9 +556,9 @@ qf_init_ext ( discard = false; linelen = STRLEN(IObuff); - if (linelen == IOSIZE - 1 && (IObuff[linelen - 1] != '\n' + if (linelen == IOSIZE - 1 && !(IObuff[linelen - 1] == '\n' #ifdef USE_CRNL - || IObuff[linelen - 1] != '\r' + || IObuff[linelen - 1] == '\r' #endif )) { // The current line exceeds IObuff, continue reading using growbuf diff --git a/src/nvim/version.c b/src/nvim/version.c index 692bbb27c8..17c1a85a95 100644 --- a/src/nvim/version.c +++ b/src/nvim/version.c @@ -558,7 +558,7 @@ static int included_patches[] = { // 1885 NA // 1884, // 1883 NA - // 1882, + 1882, 1881, // 1880 NA // 1879 NA |