From dd41037552c1be3548d2ce34bb1c889f14edb553 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=3D=3FUTF-8=3Fq=3FDundar=3D20G=3DC3=3DB6c=3F=3D?=
 <gocdundar@gmail.com>
Date: Sun, 15 May 2022 13:59:11 +0100
Subject: [PATCH] patch 8.2.4958: a couple conditions are always true

Problem:    A couple conditions are always true.
Solution:   Remove the conditions. (Goc Dundar, closes #10428)
---
 src/evalfunc.c | 53 ++++++++++++++++++++++++--------------------------
 src/quickfix.c |  2 +-
 src/version.c  |  2 ++
 3 files changed, 28 insertions(+), 29 deletions(-)

diff --git a/src/evalfunc.c b/src/evalfunc.c
index f7a04fdc98231..2c012d047efac 100644
--- a/src/evalfunc.c
+++ b/src/evalfunc.c
@@ -9788,43 +9788,40 @@ f_spellsuggest(typval_T *argvars UNUSED, typval_T *rettv)
     }
 
 #ifdef FEAT_SPELL
-    if (*curwin->w_s->b_p_spl != NUL)
+    str = tv_get_string(&argvars[0]);
+    if (argvars[1].v_type != VAR_UNKNOWN)
     {
-	str = tv_get_string(&argvars[0]);
-	if (argvars[1].v_type != VAR_UNKNOWN)
+	maxcount = (int)tv_get_number_chk(&argvars[1], &typeerr);
+	if (maxcount <= 0)
+	    return;
+	if (argvars[2].v_type != VAR_UNKNOWN)
 	{
-	    maxcount = (int)tv_get_number_chk(&argvars[1], &typeerr);
-	    if (maxcount <= 0)
+	    need_capital = (int)tv_get_bool_chk(&argvars[2], &typeerr);
+	    if (typeerr)
 		return;
-	    if (argvars[2].v_type != VAR_UNKNOWN)
-	    {
-		need_capital = (int)tv_get_bool_chk(&argvars[2], &typeerr);
-		if (typeerr)
-		    return;
-	    }
 	}
-	else
-	    maxcount = 25;
+    }
+    else
+	maxcount = 25;
 
-	spell_suggest_list(&ga, str, maxcount, need_capital, FALSE);
+    spell_suggest_list(&ga, str, maxcount, need_capital, FALSE);
 
-	for (i = 0; i < ga.ga_len; ++i)
-	{
-	    str = ((char_u **)ga.ga_data)[i];
+    for (i = 0; i < ga.ga_len; ++i)
+    {
+	str = ((char_u **)ga.ga_data)[i];
 
-	    li = listitem_alloc();
-	    if (li == NULL)
-		vim_free(str);
-	    else
-	    {
-		li->li_tv.v_type = VAR_STRING;
-		li->li_tv.v_lock = 0;
-		li->li_tv.vval.v_string = str;
-		list_append(rettv->vval.v_list, li);
-	    }
+	li = listitem_alloc();
+	if (li == NULL)
+	    vim_free(str);
+	else
+	{
+	    li->li_tv.v_type = VAR_STRING;
+	    li->li_tv.v_lock = 0;
+	    li->li_tv.vval.v_string = str;
+	    list_append(rettv->vval.v_list, li);
 	}
-	ga_clear(&ga);
     }
+    ga_clear(&ga);
     curwin->w_p_spell = wo_spell_save;
 #endif
 }
diff --git a/src/quickfix.c b/src/quickfix.c
index aab1683f329c6..dde3f9d566418 100644
--- a/src/quickfix.c
+++ b/src/quickfix.c
@@ -2494,7 +2494,7 @@ qf_push_dir(char_u *dirbuf, struct dir_stack_T **stackptr, int is_file_stack)
     // store directory on the stack
     if (vim_isAbsName(dirbuf)
 	    || (*stackptr)->next == NULL
-	    || (*stackptr && is_file_stack))
+	    || is_file_stack)
 	(*stackptr)->dirname = vim_strsave(dirbuf);
     else
     {
diff --git a/src/version.c b/src/version.c
index 711349a35fb3c..856922e1f512e 100644
--- a/src/version.c
+++ b/src/version.c
@@ -746,6 +746,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    4958,
 /**/
     4957,
 /**/