summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
Diffstat (limited to 'src')
-rw-r--r--src/screen.c11
-rw-r--r--src/version.c2
2 files changed, 12 insertions, 1 deletions
diff --git a/src/screen.c b/src/screen.c
index cc9c9f6dc..2c9bbef9e 100644
--- a/src/screen.c
+++ b/src/screen.c
@@ -4189,7 +4189,9 @@ win_line(
}
else
{
+#ifdef FEAT_LINEBREAK
int c0;
+#endif
if (p_extra_free != NULL)
{
@@ -4199,7 +4201,9 @@ win_line(
/*
* Get a character from the line itself.
*/
+#ifdef FEAT_LINEBREAK
c0 = c = *ptr;
+#endif
#ifdef FEAT_MBYTE
if (has_mbyte)
{
@@ -4216,7 +4220,12 @@ win_line(
/* Overlong encoded ASCII or ASCII with composing char
* is displayed normally, except a NUL. */
if (mb_c < 0x80)
- c0 = c = mb_c;
+ {
+ c = mb_c;
+# ifdef FEAT_LINEBREAK
+ c0 = mb_c;
+# endif
+ }
mb_utf8 = TRUE;
/* At start of the line we can have a composing char.
diff --git a/src/version.c b/src/version.c
index ccde26dd1..7099c2d65 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 */
/**/
+ 382,
+/**/
381,
/**/
380,