# HG changeset patch
# User Bram Moolenaar <Bram@vim.org>
# Date 1654096503 -7200
# Node ID eee580a4c40230915ee8ab13eec6708b1b7734f4
# Parent  802f18a85cb531e5c4479e0a9812d4f0bab1fd5a
patch 8.2.5051: check for autocmd_add() event argument is confusing

Commit: https://github.com/vim/vim/commit/882476ad7b4944a8386993e94b7e31139a314f91
Author: Bram Moolenaar <Bram@vim.org>
Date:   Wed Jun 1 16:02:38 2022 +0100

    patch 8.2.5051: check for autocmd_add() event argument is confusing

    Problem:    Check for autocmd_add() event argument is confusing.
    Solution:   Make the code more straightforward.

diff --git a/src/autocmd.c b/src/autocmd.c
--- a/src/autocmd.c
+++ b/src/autocmd.c
@@ -2951,26 +2951,24 @@ autocmd_add_or_delete(typval_T *argvars,
 		    if (eli == NULL)
 			break;
 		    if (eli->li_tv.v_type != VAR_STRING
-			    || eli->li_tv.vval.v_string == NULL)
+			    || (p = eli->li_tv.vval.v_string) == NULL)
 		    {
 			emsg(_(e_string_required));
-			continue;
+			break;
 		    }
-		    p = eli->li_tv.vval.v_string;
 		}
 		else
 		{
-		    if (end == NULL)
-			p = end = event_name;
-		    if (end == NULL || *end == NUL)
+		    if (p == NULL)
+			p = event_name;
+		    if (p == NULL || *p == NUL)
 			break;
 		}
-		if (p == NULL)
-		    continue;
 
 		event = event_name2nr(p, &end);
 		if (event == NUM_EVENTS || *end != NUL)
 		{
+		    // this also catches something following a valid event name
 		    semsg(_(e_no_such_event_str), p);
 		    retval = VVAL_FALSE;
 		    break;
diff --git a/src/version.c b/src/version.c
--- a/src/version.c
+++ b/src/version.c
@@ -735,6 +735,8 @@ static char *(features[]) =
 static int included_patches[] =
 {   /* Add new patch number below this line */
 /**/
+    5051,
+/**/
     5050,
 /**/
     5049,