Mercurial > vim
comparison src/drawline.c @ 25170:ac54d215fbec v8.2.3121
patch 8.2.3121: 'listchars' "exceeds" character appears in foldcolumn
Commit: https://github.com/vim/vim/commit/41fb723ee97baa2f095cde601a5a144b168b7a6b
Author: Bram Moolenaar <Bram@vim.org>
Date: Thu Jul 8 12:40:05 2021 +0200
patch 8.2.3121: 'listchars' "exceeds" character appears in foldcolumn
Problem: 'listchars' "exceeds" character appears in foldcolumn. Window
separator is missing. (Leonid V. Fedorenchik)
Solution: Only draw the "exceeds" character in the text area. Break the
loop when not drawing the text. (closes #8524)
author | Bram Moolenaar <Bram@vim.org> |
---|---|
date | Thu, 08 Jul 2021 12:45:03 +0200 |
parents | 18a00b2b9c27 |
children | b04e76e66128 |
comparison
equal
deleted
inserted
replaced
25169:0a239b6dde5e | 25170:ac54d215fbec |
---|---|
2781 } | 2781 } |
2782 | 2782 |
2783 // Show "extends" character from 'listchars' if beyond the line end and | 2783 // Show "extends" character from 'listchars' if beyond the line end and |
2784 // 'list' is set. | 2784 // 'list' is set. |
2785 if (wp->w_lcs_chars.ext != NUL | 2785 if (wp->w_lcs_chars.ext != NUL |
2786 && draw_state == WL_LINE | |
2786 && wp->w_p_list | 2787 && wp->w_p_list |
2787 && !wp->w_p_wrap | 2788 && !wp->w_p_wrap |
2788 #ifdef FEAT_DIFF | 2789 #ifdef FEAT_DIFF |
2789 && filler_todo <= 0 | 2790 && filler_todo <= 0 |
2790 #endif | 2791 #endif |
3048 if (( | 3049 if (( |
3049 #ifdef FEAT_RIGHTLEFT | 3050 #ifdef FEAT_RIGHTLEFT |
3050 wp->w_p_rl ? (col < 0) : | 3051 wp->w_p_rl ? (col < 0) : |
3051 #endif | 3052 #endif |
3052 (col >= wp->w_width)) | 3053 (col >= wp->w_width)) |
3053 && (*ptr != NUL | 3054 && (draw_state != WL_LINE |
3055 || *ptr != NUL | |
3054 #ifdef FEAT_DIFF | 3056 #ifdef FEAT_DIFF |
3055 || filler_todo > 0 | 3057 || filler_todo > 0 |
3056 #endif | 3058 #endif |
3057 || (wp->w_p_list && wp->w_lcs_chars.eol != NUL | 3059 || (wp->w_p_list && wp->w_lcs_chars.eol != NUL |
3058 && p_extra != at_end_str) | 3060 && p_extra != at_end_str) |