mirror of
https://github.com/vim/vim.git
synced 2025-07-26 11:04:33 -04:00
patch 8.0.0454: compiler warnings for "always true" comparison
Problem: Compiler warnings for comparing unsigned char with 256 always being true. (Manuel Ortega) Solution: Add type cast.
This commit is contained in:
parent
025a6b708a
commit
977d037336
@ -1090,7 +1090,7 @@ win_lbr_chartabsize(
|
|||||||
*/
|
*/
|
||||||
if (wp->w_p_lbr
|
if (wp->w_p_lbr
|
||||||
&& VIM_ISBREAK(c)
|
&& VIM_ISBREAK(c)
|
||||||
&& !VIM_ISBREAK(s[1])
|
&& !VIM_ISBREAK((int)s[1])
|
||||||
&& wp->w_p_wrap
|
&& wp->w_p_wrap
|
||||||
# ifdef FEAT_WINDOWS
|
# ifdef FEAT_WINDOWS
|
||||||
&& wp->w_width != 0
|
&& wp->w_width != 0
|
||||||
@ -1120,7 +1120,7 @@ win_lbr_chartabsize(
|
|||||||
if (!(c != NUL
|
if (!(c != NUL
|
||||||
&& (VIM_ISBREAK(c)
|
&& (VIM_ISBREAK(c)
|
||||||
|| (!VIM_ISBREAK(c)
|
|| (!VIM_ISBREAK(c)
|
||||||
&& (col2 == col || !VIM_ISBREAK(*ps))))))
|
&& (col2 == col || !VIM_ISBREAK((int)*ps))))))
|
||||||
break;
|
break;
|
||||||
|
|
||||||
col2 += win_chartabsize(wp, s, col2);
|
col2 += win_chartabsize(wp, s, col2);
|
||||||
|
@ -4554,7 +4554,7 @@ win_line(
|
|||||||
* Found last space before word: check for line break.
|
* Found last space before word: check for line break.
|
||||||
*/
|
*/
|
||||||
if (wp->w_p_lbr && c0 == c
|
if (wp->w_p_lbr && c0 == c
|
||||||
&& VIM_ISBREAK(c) && !VIM_ISBREAK(*ptr))
|
&& VIM_ISBREAK(c) && !VIM_ISBREAK((int)*ptr))
|
||||||
{
|
{
|
||||||
# ifdef FEAT_MBYTE
|
# ifdef FEAT_MBYTE
|
||||||
int mb_off = has_mbyte ? (*mb_head_off)(line, ptr - 1) : 0;
|
int mb_off = has_mbyte ? (*mb_head_off)(line, ptr - 1) : 0;
|
||||||
|
@ -764,6 +764,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 */
|
||||||
|
/**/
|
||||||
|
454,
|
||||||
/**/
|
/**/
|
||||||
453,
|
453,
|
||||||
/**/
|
/**/
|
||||||
|
Loading…
x
Reference in New Issue
Block a user