summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBram Moolenaar <Bram@vim.org>2016-06-02 22:18:47 +0200
committerBram Moolenaar <Bram@vim.org>2016-06-02 22:18:47 +0200
commitb37662a0fbb952838fca87aff4d26b596030b67b (patch)
tree10288eeb8d6bf230654f3cbf556d722cd4463b0e
parent83e6d7ac6a1c2a0cb5ee6c8420a5dc792f1d5ffa (diff)
patch 7.4.1882v7.4.1882
Problem: Check for line break at end of line wrong. (Dominique Pelle) Solution: Correct the logic.
-rw-r--r--src/quickfix.c4
-rw-r--r--src/version.c2
2 files changed, 4 insertions, 2 deletions
diff --git a/src/quickfix.c b/src/quickfix.c
index 5228c73e61..23b1705b33 100644
--- a/src/quickfix.c
+++ b/src/quickfix.c
@@ -643,9 +643,9 @@ qf_init_ext(
discard = FALSE;
linelen = (int)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
))
{
diff --git a/src/version.c b/src/version.c
index 53f6098187..5a84b80fdc 100644
--- a/src/version.c
+++ b/src/version.c
@@ -754,6 +754,8 @@ static char *(features[]) =
static int included_patches[] =
{ /* Add new patch number below this line */
/**/
+ 1882,
+/**/
1881,
/**/
1880,