Mercurial > vim
comparison src/screen.c @ 2699:bb3661a2eccc v7.3.116
updated for version 7.3.116
Problem: 'cursorline' is displayed too short when there are concealed
characters and 'list' is set. (Dennis Preiser)
Solution: Check for 'cursorline' when 'list' is set. (Christian Brabandt)
author | Bram Moolenaar <bram@vim.org> |
---|---|
date | Wed, 09 Feb 2011 17:09:30 +0100 |
parents | 0606065af0a0 |
children | 96a7b564c2f3 |
comparison
equal
deleted
inserted
replaced
2698:b6471224d2af | 2699:bb3661a2eccc |
---|---|
5097 (col >= W_WIDTH(wp))) | 5097 (col >= W_WIDTH(wp))) |
5098 && (*ptr != NUL | 5098 && (*ptr != NUL |
5099 #ifdef FEAT_DIFF | 5099 #ifdef FEAT_DIFF |
5100 || filler_todo > 0 | 5100 || filler_todo > 0 |
5101 #endif | 5101 #endif |
5102 || (wp->w_p_list && lcs_eol != NUL && p_extra != at_end_str) | 5102 || (wp->w_p_list && lcs_eol != NUL && p_extra != at_end_str |
5103 #ifdef FEAT_SYN_HL | |
5104 && !wp->w_p_cul | |
5105 #endif | |
5106 ) | |
5103 || (n_extra != 0 && (c_extra != NUL || *p_extra != NUL))) | 5107 || (n_extra != 0 && (c_extra != NUL || *p_extra != NUL))) |
5104 ) | 5108 ) |
5105 { | 5109 { |
5106 #ifdef FEAT_CONCEAL | 5110 #ifdef FEAT_CONCEAL |
5107 SCREEN_LINE(screen_row, W_WINCOL(wp), col - boguscols, | 5111 SCREEN_LINE(screen_row, W_WINCOL(wp), col - boguscols, |