Mercurial > vim

comparison src/screen.c @ 11672:3c6cc2f24645 v8.0.0719

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
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 3b2afa2b77b3
children 4f59d2a66bf7
comparison
equal deleted inserted replaced
11671:3b498e41d760 11672:3c6cc2f24645
181 #if defined(FEAT_SYN_HL) && defined(FEAT_RELTIME) 181 #if defined(FEAT_SYN_HL) && defined(FEAT_RELTIME)
182 /* Can limit syntax highlight time to 'redrawtime'. */ 182 /* Can limit syntax highlight time to 'redrawtime'. */
183 # define SYN_TIME_LIMIT 1 183 # define SYN_TIME_LIMIT 1
184 #endif 184 #endif
185 185
186 #ifdef FEAT_RIGHTLEFT
187 # define HAS_RIGHTLEFT(x) x
188 #else
189 # define HAS_RIGHTLEFT(x) FALSE
190 #endif
191
186 /* 192 /*
187 * Redraw the current window later, with update_screen(type). 193 * Redraw the current window later, with update_screen(type).
188 * Set must_redraw only if not already set to a higher value. 194 * Set must_redraw only if not already set to a higher value.
189 * e.g. if must_redraw is CLEAR, type NOT_VALID will do nothing. 195 * e.g. if must_redraw is CLEAR, type NOT_VALID will do nothing.
190 */ 196 */
3999 && filler_todo <= 0 4005 && filler_todo <= 0
4000 #endif 4006 #endif
4001 ) 4007 )
4002 { 4008 {
4003 screen_line(screen_row, W_WINCOL(wp), col, -(int)W_WIDTH(wp), 4009 screen_line(screen_row, W_WINCOL(wp), col, -(int)W_WIDTH(wp),
4004 wp->w_p_rl); 4010 HAS_RIGHTLEFT(wp->w_p_rl));
4005 /* Pretend we have finished updating the window. Except when 4011 /* Pretend we have finished updating the window. Except when
4006 * 'cursorcolumn' is set. */ 4012 * 'cursorcolumn' is set. */
4007 #ifdef FEAT_SYN_HL 4013 #ifdef FEAT_SYN_HL
4008 if (wp->w_p_cuc) 4014 if (wp->w_p_cuc)
4009 row = wp->w_cline_row + wp->w_cline_height; 4015 row = wp->w_cline_row + wp->w_cline_height;
5446 } 5452 }
5447 } 5453 }
5448 #endif 5454 #endif
5449 5455
5450 screen_line(screen_row, W_WINCOL(wp), col, 5456 screen_line(screen_row, W_WINCOL(wp), col,
5451 (int)W_WIDTH(wp), wp->w_p_rl); 5457 (int)W_WIDTH(wp), HAS_RIGHTLEFT(wp->w_p_rl));
5452 row++; 5458 row++;
5453 5459
5454 /* 5460 /*
5455 * Update w_cline_height and w_cline_folded if the cursor line was 5461 * Update w_cline_height and w_cline_folded if the cursor line was
5456 * updated (saves a call to plines() later). 5462 * updated (saves a call to plines() later).
5752 || (n_extra != 0 && (c_extra != NUL || *p_extra != NUL))) 5758 || (n_extra != 0 && (c_extra != NUL || *p_extra != NUL)))
5753 ) 5759 )
5754 { 5760 {
5755 #ifdef FEAT_CONCEAL 5761 #ifdef FEAT_CONCEAL
5756 screen_line(screen_row, W_WINCOL(wp), col - boguscols, 5762 screen_line(screen_row, W_WINCOL(wp), col - boguscols,
5757 (int)W_WIDTH(wp), wp->w_p_rl); 5763 (int)W_WIDTH(wp), HAS_RIGHTLEFT(wp->w_p_rl));
5758 boguscols = 0; 5764 boguscols = 0;
5759 #else 5765 #else
5760 screen_line(screen_row, W_WINCOL(wp), col, 5766 screen_line(screen_row, W_WINCOL(wp), col,
5761 (int)W_WIDTH(wp), wp->w_p_rl); 5767 (int)W_WIDTH(wp), HAS_RIGHTLEFT(wp->w_p_rl));
5762 #endif 5768 #endif
5763 ++row; 5769 ++row;
5764 ++screen_row; 5770 ++screen_row;
5765 5771
5766 /* When not wrapping and finished diff lines, or when displayed 5772 /* When not wrapping and finished diff lines, or when displayed