# HG changeset patch
# User Bram Moolenaar <Bram@vim.org>
# Date 1658934004 -7200
# Node ID d3058719eff5258c51e381e76e672109507ac091
# Parent  f25ba0f8e43b34ad8bc4bb3c045f88296c9839f1
patch 9.0.0095: conditions are always true

Commit: https://github.com/vim/vim/commit/122dea70073d140aa89212d344c3f62bd3b5b3fa
Author: zeertzjq <zeertzjq@outlook.com>
Date:   Wed Jul 27 15:48:45 2022 +0100

    patch 9.0.0095: conditions are always true

    Problem:    Conditions are always true.
    Solution:   Remove useless conditions. (closes https://github.com/vim/vim/issues/10802)

diff --git a/src/buffer.c b/src/buffer.c
--- a/src/buffer.c
+++ b/src/buffer.c
@@ -4297,7 +4297,7 @@ build_stl_str_hl(
     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 @@ build_stl_str_hl(
 	    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
--- a/src/cindent.c
+++ b/src/cindent.c
@@ -2267,7 +2267,8 @@ get_c_indent(void)
 			}
 			// 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 @@ term_again:
 	// 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
--- a/src/version.c
+++ b/src/version.c
@@ -736,6 +736,8 @@ static char *(features[]) =
 static int included_patches[] =
 {   /* Add new patch number below this line */
 /**/
+    95,
+/**/
     94,
 /**/
     93,