From f7b8609446f171a6a287f61564e39a8dac5ff47d Mon Sep 17 00:00:00 2001 From: zeertzjq Date: Thu, 5 Sep 2024 17:26:30 +0200 Subject: [PATCH] patch 9.1.0717: Unnecessary nextcmd NULL checks in parse_command_modifiers() Problem: Unnecessary nextcmd NULL checks in parse_command_modifiers(). Solution: Remove them (zeertzjq) Every place parse_command_modifiers() is called, nextcmd is NULL, and after it's set to non-NULL the function returns very soon. Even if one day nextcmd may be non-NULL, the NULL checks may still be wrong as the correct behavior may be overriding nextcmd. closes: #15620 Signed-off-by: zeertzjq Signed-off-by: Christian Brabandt --- src/ex_docmd.c | 11 ++++------- src/version.c | 2 ++ 2 files changed, 6 insertions(+), 7 deletions(-) diff --git a/src/ex_docmd.c b/src/ex_docmd.c index 0e69d5c384..a24b4efbce 100644 --- a/src/ex_docmd.c +++ b/src/ex_docmd.c @@ -2898,12 +2898,9 @@ parse_command_modifiers( if (comment_start(eap->cmd, starts_with_colon)) { // a comment ends at a NL - if (eap->nextcmd == NULL) - { - eap->nextcmd = vim_strchr(eap->cmd, '\n'); - if (eap->nextcmd != NULL) - ++eap->nextcmd; - } + eap->nextcmd = vim_strchr(eap->cmd, '\n'); + if (eap->nextcmd != NULL) + ++eap->nextcmd; if (vim9script) { if (has_cmdmod(cmod, FALSE)) @@ -2916,7 +2913,7 @@ parse_command_modifiers( } return FAIL; } - if (eap->nextcmd == NULL && *eap->cmd == '\n') + if (*eap->cmd == '\n') { eap->nextcmd = eap->cmd + 1; return FAIL; diff --git a/src/version.c b/src/version.c index 80da0e30a1..145e083bf7 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 */ +/**/ + 717, /**/ 716, /**/