mirrors/neovim
1
0
Fork 0
mirror of https://github.com/neovim/neovim.git synced 2025-09-23 19:48:32 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge #6148 from delftswa2017/clang-scan-fix-dead-stores

Browse Source 
vim-patch:8.0.0353
This commit is contained in:
Justin M. Keyes
2017-02-28 00:46:09 +01:00
committed by GitHub
parent c8ee0be745 1a81ec6d88
commit 28a6d4393d
5 changed files with 26 additions and 51 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
src/nvim/screen.c
View File

@@ -4876,37 +4876,34 @@ void win_redr_status(win_T *wp)
}
if (wp->w_buffer->b_p_ro) {
STRCPY(p + len, _("[RO]"));
len += 4;
len += (int)STRLEN(p + len);
}
this_ru_col = ru_col - (Columns - wp->w_width);
if (this_ru_col < (wp->w_width + 1) / 2)
if (this_ru_col < (wp->w_width + 1) / 2) {
this_ru_col = (wp->w_width + 1) / 2;
}
if (this_ru_col <= 1) {
p = (char_u *)"<"; /* No room for file name! */
p = (char_u *)"<"; // No room for file name!
len = 1;
} else if (has_mbyte) {
} else {
int clen = 0, i;
/* Count total number of display cells. */
clen = (int) mb_string2cells(p);
// Count total number of display cells.
clen = (int)mb_string2cells(p);
/* Find first character that will fit.
* Going from start to end is much faster for DBCS. */
// Find first character that will fit.
// Going from start to end is much faster for DBCS.
for (i = 0; p[i] != NUL && clen >= this_ru_col - 1;
i += (*mb_ptr2len)(p + i))
i += (*mb_ptr2len)(p + i)) {
clen -= (*mb_ptr2cells)(p + i);
}
len = clen;
if (i > 0) {
p = p + i - 1;
*p = '<';
++len;
}
} else if (len > this_ru_col - 1) {
p += len - (this_ru_col - 1);
*p = '<';
len = this_ru_col - 1;
}
row = wp->w_winrow + wp->w_height;