]> git.ipfire.org Git - thirdparty/vim.git/commitdiff
patch 9.1.0653: Patch v9.1.0648 not completely right v9.1.0653
authorChristian Brabandt <cb@256bit.org>
Fri, 2 Aug 2024 17:06:41 +0000 (19:06 +0200)
committerChristian Brabandt <cb@256bit.org>
Fri, 2 Aug 2024 17:06:41 +0000 (19:06 +0200)
Problem:  Patch v9.1.0648 not completely right
          (zeertzjq)
Solution: Remove always true condition

closes: #15415

Signed-off-by: Christian Brabandt <cb@256bit.org>
src/ex_cmds2.c
src/version.c

index 0d76b3b27aa75fdf3171fc0367e5a865c97c521a..0681153179e538c71bf0f3a41e98d96a744da9aa 100644 (file)
@@ -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);
        }
     }
index ea418160f5dd7b951fc43110add4bfac032aa170..b9fdfcd23302ae0038b449487c60f58d77217698 100644 (file)
@@ -704,6 +704,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    653,
 /**/
     652,
 /**/