aniani/vim
0
0
Fork 1
mirror of https://github.com/vim/vim.git synced 2025-09-29 04:34:16 -04:00
Code Activity

patch 8.1.1289: may not have enough space to add "W" to search stats

Browse Source 
Problem:    May not have enough space to add "W" to search stats.
Solution:   Reserve a bit more space. (Christian Brabandt)
This commit is contained in:
Bram Moolenaar
2019-05-07 21:34:37 +02:00
parent 9ce3fa828d
commit b6cb26ffe1
2 changed files with 15 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
src/search.c
View File

@@ -1219,6 +1219,7 @@ do_search(
char_u *ps; char_u *ps;
char_u *msgbuf = NULL; char_u *msgbuf = NULL;
size_t len; size_t len;
#define SEARCH_STAT_BUF_LEN 12
/* /*
* A line offset is not remembered, this is vi compatible. * A line offset is not remembered, this is vi compatible.
@@ -1399,8 +1400,8 @@ do_search(
else else
// Use up to 'showcmd' column. // Use up to 'showcmd' column.
len = (int)(Rows - msg_row - 1) * Columns + sc_col - 1; len = (int)(Rows - msg_row - 1) * Columns + sc_col - 1;
if (len < STRLEN(p) + 40 + 11) if (len < STRLEN(p) + 40 + SEARCH_STAT_BUF_LEN + 1)
len = STRLEN(p) + 40 + 11; len = STRLEN(p) + 40 + SEARCH_STAT_BUF_LEN + 1;
} }
else else
// Reserve enough space for the search pattern + offset. // Reserve enough space for the search pattern + offset.
@@ -4982,37 +4983,36 @@ search_stat(
} }
if (cur > 0) if (cur > 0)
{ {
#define STAT_BUF_LEN 12 char t[SEARCH_STAT_BUF_LEN] = "";
char t[STAT_BUF_LEN] = "";
int len; int len;
#ifdef FEAT_RIGHTLEFT #ifdef FEAT_RIGHTLEFT
if (curwin->w_p_rl && *curwin->w_p_rlc == 's') if (curwin->w_p_rl && *curwin->w_p_rlc == 's')
{ {
if (cur == OUT_OF_TIME) if (cur == OUT_OF_TIME)
vim_snprintf(t, STAT_BUF_LEN, "[?/??]"); vim_snprintf(t, SEARCH_STAT_BUF_LEN, "[?/??]");
else if (cnt > 99 && cur > 99) else if (cnt > 99 && cur > 99)
vim_snprintf(t, STAT_BUF_LEN, "[>99/>99]"); vim_snprintf(t, SEARCH_STAT_BUF_LEN, "[>99/>99]");
else if (cnt > 99) else if (cnt > 99)
vim_snprintf(t, STAT_BUF_LEN, "[>99/%d]", cur); vim_snprintf(t, SEARCH_STAT_BUF_LEN, "[>99/%d]", cur);
else else
vim_snprintf(t, STAT_BUF_LEN, "[%d/%d]", cnt, cur); vim_snprintf(t, SEARCH_STAT_BUF_LEN, "[%d/%d]", cnt, cur);
} }
else else
#endif #endif
{ {
if (cur == OUT_OF_TIME) if (cur == OUT_OF_TIME)
vim_snprintf(t, STAT_BUF_LEN, "[?/??]"); vim_snprintf(t, SEARCH_STAT_BUF_LEN, "[?/??]");
else if (cnt > 99 && cur > 99) else if (cnt > 99 && cur > 99)
vim_snprintf(t, STAT_BUF_LEN, "[>99/>99]"); vim_snprintf(t, SEARCH_STAT_BUF_LEN, "[>99/>99]");
else if (cnt > 99) else if (cnt > 99)
vim_snprintf(t, STAT_BUF_LEN, "[%d/>99]", cur); vim_snprintf(t, SEARCH_STAT_BUF_LEN, "[%d/>99]", cur);
else else
vim_snprintf(t, STAT_BUF_LEN, "[%d/%d]", cur, cnt); vim_snprintf(t, SEARCH_STAT_BUF_LEN, "[%d/%d]", cur, cnt);
} }
len = STRLEN(t); len = STRLEN(t);
if (show_top_bot_msg && len + 3 < STAT_BUF_LEN) if (show_top_bot_msg && len + 3 < SEARCH_STAT_BUF_LEN)
{ {
STRCPY(t + len, " W"); STRCPY(t + len, " W");
len += 2; len += 2;

2
src/version.c
View File

@@ -767,6 +767,8 @@ static char *(features[]) =
static int included_patches[] = static int included_patches[] =
{ /* Add new patch number below this line */ { /* Add new patch number below this line */
/**/
1289,
/**/ /**/
1288, 1288,
/**/ /**/