thac0/vim
1
0
Fork 0
forked from aniani/vim
Code Activity

patch 8.2.5066: timer_create is not available on every Mac system

Browse Source 
Problem:    Timer_create is not available on every Mac system. (Hisashi T
            Fujinaka)
Solution:   Adjust #ifdef.
This commit is contained in:
Bram Moolenaar
2022-06-07 10:16:15 +01:00
parent 739f7998ab
commit aca12fd89b
8 changed files with 246 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
src/drawline.c
View File

@@ -767,6 +767,7 @@ win_line(
{
if (wp->w_lcs_chars.space
|| wp->w_lcs_chars.multispace != NULL
|| wp->w_lcs_chars.leadmultispace != NULL
|| wp->w_lcs_chars.trail
|| wp->w_lcs_chars.lead
|| wp->w_lcs_chars.nbsp)
@@ -781,7 +782,7 @@ win_line(
trailcol += (colnr_T) (ptr - line);
}
// find end of leading whitespace
if (wp->w_lcs_chars.lead)
if (wp->w_lcs_chars.lead || wp->w_lcs_chars.leadmultispace != NULL)
{
leadcol = 0;
while (VIM_ISWHITE(ptr[leadcol]))
@@ -2118,8 +2119,24 @@ win_line(
if ((trailcol != MAXCOL && ptr > line + trailcol && c == ' ')
|| (leadcol != 0 && ptr < line + leadcol && c == ' '))
{
c = (ptr > line + trailcol) ? wp->w_lcs_chars.trail
: wp->w_lcs_chars.lead;
if (leadcol != 0 && in_multispace && ptr < line + leadcol
&& wp->w_lcs_chars.leadmultispace != NULL)
{
c = wp->w_lcs_chars.leadmultispace[multispace_pos++];
if (wp->w_lcs_chars.leadmultispace[multispace_pos] == NUL)
multispace_pos = 0;
}
else if (ptr > line + trailcol && wp->w_lcs_chars.trail)
c = wp->w_lcs_chars.trail;
else if (ptr < line + leadcol && wp->w_lcs_chars.lead)
c = wp->w_lcs_chars.lead;
else if (leadcol != 0 && c == ' ' && wp->w_lcs_chars.space)
c = wp->w_lcs_chars.space;
if (!attr_pri)
{
n_attr = 1;