patch 8.0.0719: build failure without +terminal feature

Problem:    Build failure without +terminal feature.
Solution:   Add #ifdefs.

diff --git a/src/channel.c b/src/channel.c
index 9ba013a852d2ff5414f182c66041a320cb6cc5e7..939b51392ad0e5adc9bb176da377af7b5f1d1357 100644 (file)
--- a/src/channel.c
+++ b/src/channel.c
@@ -2657,9 +2657,11 @@ may_invoke_callback(channel_T *channel, ch_part_T part)
                msg = json_encode(listtv, ch_mode);
            if (msg != NULL)
            {
+#ifdef FEAT_TERMINAL
                if (buffer->b_term != NULL)
                    write_to_term(buffer, msg, channel);
                else
+#endif
                    append_to_buffer(buffer, msg, channel, part);
            }
        }

diff --git a/src/screen.c b/src/screen.c
index 944eecd02fb661253a2c18a5d9f867d072e04220..0ec9ea28166a6ede0696bb463f2450d1b0bc232d 100644 (file)
--- a/src/screen.c
+++ b/src/screen.c
@@ -183,6 +183,12 @@ static int screen_char_attr = 0;
 # define SYN_TIME_LIMIT 1
 #endif
 
+#ifdef FEAT_RIGHTLEFT
+# define HAS_RIGHTLEFT(x) x
+#else
+# define HAS_RIGHTLEFT(x) FALSE
+#endif
+
 /*
  * Redraw the current window later, with update_screen(type).
  * Set must_redraw only if not already set to a higher value.
@@ -4001,7 +4007,7 @@ win_line(
                )
        {
            screen_line(screen_row, W_WINCOL(wp), col, -(int)W_WIDTH(wp),
-                                                                 wp->w_p_rl);
+                                                   HAS_RIGHTLEFT(wp->w_p_rl));
            /* Pretend we have finished updating the window.  Except when
             * 'cursorcolumn' is set. */
 #ifdef FEAT_SYN_HL
@@ -5448,7 +5454,7 @@ win_line(
 #endif
 
            screen_line(screen_row, W_WINCOL(wp), col,
-                                               (int)W_WIDTH(wp), wp->w_p_rl);
+                                 (int)W_WIDTH(wp), HAS_RIGHTLEFT(wp->w_p_rl));
            row++;
 
            /*
@@ -5754,11 +5760,11 @@ win_line(
        {
 #ifdef FEAT_CONCEAL
            screen_line(screen_row, W_WINCOL(wp), col - boguscols,
-                                               (int)W_WIDTH(wp), wp->w_p_rl);
+                                 (int)W_WIDTH(wp), HAS_RIGHTLEFT(wp->w_p_rl));
            boguscols = 0;
 #else
            screen_line(screen_row, W_WINCOL(wp), col,
-                                               (int)W_WIDTH(wp), wp->w_p_rl);
+                                 (int)W_WIDTH(wp), HAS_RIGHTLEFT(wp->w_p_rl));
 #endif
            ++row;
            ++screen_row;

diff --git a/src/version.c b/src/version.c
index d23c0e1e7467b8dee02f4196cb7883e0262687d1..bd274f730dc77f027e3d3c5e42051c4af2585ed9 100644 (file)
--- a/src/version.c
+++ b/src/version.c
@@ -769,6 +769,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    719,
 /**/
     718,
 /**/