patch 9.0.0095: conditions are always true
Problem: Conditions are always true.
Solution: Remove useless conditions. (closes #10802)
diff --git a/src/buffer.c b/src/buffer.c
index 436c0e9..108d596 100644
--- a/src/buffer.c
+++ b/src/buffer.c
@@ -4297,7 +4297,7 @@
curitem = 0;
prevchar_isflag = TRUE;
prevchar_isitem = FALSE;
- for (s = usefmt; *s; )
+ for (s = usefmt; *s != NUL; )
{
if (curitem == (int)stl_items_len)
{
@@ -4327,7 +4327,7 @@
stl_items_len = new_len;
}
- if (*s != NUL && *s != '%')
+ if (*s != '%')
prevchar_isflag = prevchar_isitem = FALSE;
/*
diff --git a/src/cindent.c b/src/cindent.c
index 48ddca5..15b459c 100644
--- a/src/cindent.c
+++ b/src/cindent.c
@@ -2267,7 +2267,8 @@
}
// If the start comment string doesn't match with the
// start of the comment, skip this entry. XXX
- else if (STRNCMP(ml_get(comment_pos->lnum) + comment_pos->col,
+ else if (STRNCMP(ml_get(comment_pos->lnum)
+ + comment_pos->col,
lead_start, lead_start_len) != 0)
continue;
}
@@ -3717,7 +3718,7 @@
// Are we at the start of a cpp base class declaration or
// constructor initialization? XXX
n = FALSE;
- if (curbuf->b_ind_cpp_baseclass != 0 && theline[0] != '{')
+ if (curbuf->b_ind_cpp_baseclass != 0)
{
n = cin_is_cpp_baseclass(&cache_cpp_baseclass);
l = ml_get_curline();
diff --git a/src/version.c b/src/version.c
index 8232111..064d566 100644
--- a/src/version.c
+++ b/src/version.c
@@ -736,6 +736,8 @@
static int included_patches[] =
{ /* Add new patch number below this line */
/**/
+ 95,
+/**/
94,
/**/
93,