summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorChristian Brabandt <cb@256bit.org>2024-08-02 19:06:41 +0200
committerChristian Brabandt <cb@256bit.org>2024-08-02 19:06:41 +0200
commita0b5bc12850f1d87fa51fb7be42df0ea835ccf21 (patch)
tree30f4c62052fa464b6171259b1944f6017479f4aa
parentb4ea77185c7deeb6f7c8d5aa14f8c97a097e5dee (diff)
patch 9.1.0653: Patch v9.1.0648 not completely rightv9.1.0653
Problem: Patch v9.1.0648 not completely right (zeertzjq) Solution: Remove always true condition closes: #15415 Signed-off-by: Christian Brabandt <cb@256bit.org>
-rw-r--r--src/ex_cmds2.c4
-rw-r--r--src/version.c2
2 files changed, 3 insertions, 3 deletions
diff --git a/src/ex_cmds2.c b/src/ex_cmds2.c
index 0d76b3b27a..0681153179 100644
--- a/src/ex_cmds2.c
+++ b/src/ex_cmds2.c
@@ -197,11 +197,9 @@ dialog_changed(
// restore to empty when write failed
if (empty_bufname)
{
- // prevent double free
- if (buf->b_sfname != buf->b_ffname)
- VIM_CLEAR(buf->b_sfname);
buf->b_fname = NULL;
VIM_CLEAR(buf->b_ffname);
+ VIM_CLEAR(buf->b_sfname);
unchanged(buf, TRUE, FALSE);
}
}
diff --git a/src/version.c b/src/version.c
index ea418160f5..b9fdfcd233 100644
--- a/src/version.c
+++ b/src/version.c
@@ -705,6 +705,8 @@ static char *(features[]) =
static int included_patches[] =
{ /* Add new patch number below this line */
/**/
+ 653,
+/**/
652,
/**/
651,