summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBram Moolenaar <Bram@vim.org>2017-02-27 21:11:35 +0100
committerBram Moolenaar <Bram@vim.org>2017-02-27 21:11:35 +0100
commit10a8da0594406c37f8971cbd16ebbebf831dc60f (patch)
treea0d3ec63eafb0a81dac3228d1f3f3b1da8d12efc
parent88e7688edaf6fcf079d3c1b1070c852cfbb28185 (diff)
downloadvim-git-10a8da0594406c37f8971cbd16ebbebf831dc60f.tar.gz
patch 8.0.0383: misplaced #ifdefv8.0.0383
Problem: Misplaced #ifdef. (Christ van Willigen) Solution: Split assignment.
-rw-r--r--src/screen.c3
-rw-r--r--src/version.c2
2 files changed, 4 insertions, 1 deletions
diff --git a/src/screen.c b/src/screen.c
index 2c9bbef9e..8514f3e38 100644
--- a/src/screen.c
+++ b/src/screen.c
@@ -4201,8 +4201,9 @@ win_line(
/*
* Get a character from the line itself.
*/
+ c = *ptr;
#ifdef FEAT_LINEBREAK
- c0 = c = *ptr;
+ c0 = *ptr;
#endif
#ifdef FEAT_MBYTE
if (has_mbyte)
diff --git a/src/version.c b/src/version.c
index 7099c2d65..232b65dc8 100644
--- a/src/version.c
+++ b/src/version.c
@@ -765,6 +765,8 @@ static char *(features[]) =
static int included_patches[] =
{ /* Add new patch number below this line */
/**/
+ 383,
+/**/
382,
/**/
381,