Commit: patch 9.1.0653: Patch v9.1.0648 not completely right

3 views
Skip to first unread message

Christian Brabandt

unread,
Aug 2, 2024, 1:15:15 PM8/2/24
to vim...@googlegroups.com
patch 9.1.0653: Patch v9.1.0648 not completely right

Commit: https://github.com/vim/vim/commit/a0b5bc12850f1d87fa51fb7be42df0ea835ccf21
Author: Christian Brabandt <c...@256bit.org>
Date: Fri Aug 2 19:06:41 2024 +0200

patch 9.1.0653: Patch v9.1.0648 not completely right

Problem: Patch v9.1.0648 not completely right
(zeertzjq)
Solution: Remove always true condition

closes: #15415

Signed-off-by: Christian Brabandt <c...@256bit.org>

diff --git a/src/ex_cmds2.c b/src/ex_cmds2.c
index 0d76b3b27..068115317 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 ea418160f..b9fdfcd23 100644
--- a/src/version.c
+++ b/src/version.c
@@ -704,6 +704,8 @@ static char *(features[]) =

static int included_patches[] =
{ /* Add new patch number below this line */
+/**/
+ 653,
/**/
652,
/**/
Reply all
Reply to author
Forward
0 new messages