mirror of
https://github.com/vim/vim.git
synced 2025-09-26 04:04:07 -04:00
patch 8.0.0719: build failure without +terminal feature
Problem: Build failure without +terminal feature. Solution: Add #ifdefs.
This commit is contained in:
@@ -2657,9 +2657,11 @@ may_invoke_callback(channel_T *channel, ch_part_T part)
|
|||||||
msg = json_encode(listtv, ch_mode);
|
msg = json_encode(listtv, ch_mode);
|
||||||
if (msg != NULL)
|
if (msg != NULL)
|
||||||
{
|
{
|
||||||
|
#ifdef FEAT_TERMINAL
|
||||||
if (buffer->b_term != NULL)
|
if (buffer->b_term != NULL)
|
||||||
write_to_term(buffer, msg, channel);
|
write_to_term(buffer, msg, channel);
|
||||||
else
|
else
|
||||||
|
#endif
|
||||||
append_to_buffer(buffer, msg, channel, part);
|
append_to_buffer(buffer, msg, channel, part);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
14
src/screen.c
14
src/screen.c
@@ -183,6 +183,12 @@ static int screen_char_attr = 0;
|
|||||||
# define SYN_TIME_LIMIT 1
|
# define SYN_TIME_LIMIT 1
|
||||||
#endif
|
#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).
|
* Redraw the current window later, with update_screen(type).
|
||||||
* Set must_redraw only if not already set to a higher value.
|
* 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),
|
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
|
/* Pretend we have finished updating the window. Except when
|
||||||
* 'cursorcolumn' is set. */
|
* 'cursorcolumn' is set. */
|
||||||
#ifdef FEAT_SYN_HL
|
#ifdef FEAT_SYN_HL
|
||||||
@@ -5448,7 +5454,7 @@ win_line(
|
|||||||
#endif
|
#endif
|
||||||
|
|
||||||
screen_line(screen_row, W_WINCOL(wp), col,
|
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++;
|
row++;
|
||||||
|
|
||||||
/*
|
/*
|
||||||
@@ -5754,11 +5760,11 @@ win_line(
|
|||||||
{
|
{
|
||||||
#ifdef FEAT_CONCEAL
|
#ifdef FEAT_CONCEAL
|
||||||
screen_line(screen_row, W_WINCOL(wp), col - boguscols,
|
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;
|
boguscols = 0;
|
||||||
#else
|
#else
|
||||||
screen_line(screen_row, W_WINCOL(wp), col,
|
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
|
#endif
|
||||||
++row;
|
++row;
|
||||||
++screen_row;
|
++screen_row;
|
||||||
|
@@ -769,6 +769,8 @@ static char *(features[]) =
|
|||||||
|
|
||||||
static int included_patches[] =
|
static int included_patches[] =
|
||||||
{ /* Add new patch number below this line */
|
{ /* Add new patch number below this line */
|
||||||
|
/**/
|
||||||
|
719,
|
||||||
/**/
|
/**/
|
||||||
718,
|
718,
|
||||||
/**/
|
/**/
|
||||||
|
Reference in New Issue
Block a user