diff options
| author | Justin M. Keyes <justinkz@gmail.com> | 2017-03-15 14:10:56 +0100 |
|---|---|---|
| committer | Justin M. Keyes <justinkz@gmail.com> | 2017-03-15 14:10:56 +0100 |
| commit | ec4e84210b87965e7110b061a321c7ec8a359d47 (patch) | |
| tree | d6b880ee8fa788dab05e83d300bcfe8279fb163a /src/nvim/quickfix.c | |
| parent | 3b52e3c4c8784d60e44f3dc9a6bb7795af588931 (diff) | |
| parent | 2ecab2193d6ea866be77588a80ce14669a008a7b (diff) | |
| download | rneovim-ec4e84210b87965e7110b061a321c7ec8a359d47.tar.gz rneovim-ec4e84210b87965e7110b061a321c7ec8a359d47.tar.bz2 rneovim-ec4e84210b87965e7110b061a321c7ec8a359d47.zip | |
Merge #6254 'vim-patch:7.4.2135,7.4.2144,7.4.2151'
Diffstat (limited to 'src/nvim/quickfix.c')
| -rw-r--r-- | src/nvim/quickfix.c | 27 |
1 files changed, 8 insertions, 19 deletions
diff --git a/src/nvim/quickfix.c b/src/nvim/quickfix.c index 7f5e5a481b..3f7975051f 100644 --- a/src/nvim/quickfix.c +++ b/src/nvim/quickfix.c @@ -564,11 +564,8 @@ static int qf_get_next_file_line(qfstate_T *state) bool discard = false; state->linelen = STRLEN(IObuff); - if (state->linelen == IOSIZE - 1 && !(IObuff[state->linelen - 1] == '\n' -#ifdef USE_CRNL - || IObuff[state->linelen - 1] == '\r' -#endif - )) { // NOLINT(whitespace/parens) + if (state->linelen == IOSIZE - 1 + && !(IObuff[state->linelen - 1] == '\n')) { // The current line exceeds IObuff, continue reading using growbuf // until EOL or LINE_MAXLEN bytes is read. if (state->growbuf == NULL) { @@ -587,11 +584,7 @@ static int qf_get_next_file_line(qfstate_T *state) } state->linelen = STRLEN(state->growbuf + growbuflen); growbuflen += state->linelen; - if (state->growbuf[growbuflen - 1] == '\n' -#ifdef USE_CRNL - || state->growbuf[growbuflen - 1] == '\r' -#endif - ) { + if (state->growbuf[growbuflen - 1] == '\n') { break; } if (state->growbufsiz == LINE_MAXLEN) { @@ -609,11 +602,7 @@ static int qf_get_next_file_line(qfstate_T *state) // discard everything until EOL or EOF is reached. if (fgets((char *)IObuff, IOSIZE, state->fd) == NULL || STRLEN(IObuff) < IOSIZE - 1 - || IObuff[IOSIZE - 1] == '\n' -#ifdef USE_CRNL - || IObuff[IOSIZE - 1] == '\r' -#endif - ) { + || IObuff[IOSIZE - 1] == '\n') { break; } } @@ -655,12 +644,12 @@ static int qf_get_nextline(qfstate_T *state) if (state->linelen > 0 && state->linebuf[state->linelen - 1] == '\n') { state->linebuf[state->linelen - 1] = NUL; - } #ifdef USE_CRNL - if (state->linelen > 0 && state->linebuf[state->linelen - 1] == '\r') { - state->linebuf[state->linelen - 1] = NUL; - } + if (state->linelen > 1 && state->linebuf[state->linelen - 2] == '\r') { + state->linebuf[state->linelen - 2] = NUL; + } #endif + } remove_bom(state->linebuf); |