Mercurial > vim
changeset 11672:3c6cc2f24645 v8.0.0719
patch 8.0.0719: build failure without +terminal feature
commit https://github.com/vim/vim/commit/c0aa482a5add1e1125fd983d62c67a182c76ae24
Author: Bram Moolenaar <Bram@vim.org>
Date: Sun Jul 16 14:04:29 2017 +0200
patch 8.0.0719: build failure without +terminal feature
Problem: Build failure without +terminal feature.
Solution: Add #ifdefs.
| author | Christian Brabandt <cb@256bit.org> |
|---|---|
| date | Sun, 16 Jul 2017 14:15:03 +0200 |
| parents | 3b498e41d760 |
| children | 413bb3fd261e |
| files | src/channel.c src/screen.c src/version.c |
| diffstat | 3 files changed, 14 insertions(+), 4 deletions(-) [+] |
line wrap: on
line diff
--- a/src/channel.c +++ b/src/channel.c @@ -2657,9 +2657,11 @@ may_invoke_callback(channel_T *channel, 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); } }
--- 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;