diff options
| author | Bram Moolenaar <Bram@vim.org> | 2017-07-16 14:04:29 +0200 |
|---|---|---|
| committer | Bram Moolenaar <Bram@vim.org> | 2017-07-16 14:04:29 +0200 |
| commit | c0aa482a5add1e1125fd983d62c67a182c76ae24 (patch) | |
| tree | a3fbed88286f02e27690d75679ff4dcb914b3ee7 | |
| parent | cb8bbe9bf3214d07580d6b43d6539416884153bd (diff) | |
| download | vim-git-c0aa482a5add1e1125fd983d62c67a182c76ae24.tar.gz | |
patch 8.0.0719: build failure without +terminal featurev8.0.0719
Problem: Build failure without +terminal feature.
Solution: Add #ifdefs.
| -rw-r--r-- | src/channel.c | 2 | ||||
| -rw-r--r-- | src/screen.c | 14 | ||||
| -rw-r--r-- | src/version.c | 2 |
3 files changed, 14 insertions, 4 deletions
diff --git a/src/channel.c b/src/channel.c index 9ba013a85..939b51392 100644 --- 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 944eecd02..0ec9ea281 100644 --- 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 d23c0e1e7..bd274f730 100644 --- a/src/version.c +++ b/src/version.c @@ -770,6 +770,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ /**/ + 719, +/**/ 718, /**/ 717, |