Permalink
Browse files

patch 8.0.0719: build failure without +terminal feature

Problem:    Build failure without +terminal feature.
Solution:   Add #ifdefs.
  • Loading branch information...
brammool committed Jul 16, 2017
1 parent cb8bbe9 commit c0aa482a5add1e1125fd983d62c67a182c76ae24
Showing with 14 additions and 4 deletions.
  1. +2 −0 src/channel.c
  2. +10 −4 src/screen.c
  3. +2 −0 src/version.c
View
@@ -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);
}
}
View
@@ -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;
View
@@ -769,6 +769,8 @@ static char *(features[]) =
static int included_patches[] =
{ /* Add new patch number below this line */
/**/
719,
/**/
718,
/**/

0 comments on commit c0aa482

Please sign in to comment.