1 files changed, 7 insertions, 3 deletions
diff --git a/src/nvim/eval/userfunc.c b/src/nvim/eval/userfunc.c
index 27f7f42739..72559fe9e0 100644
--- a/src/nvim/eval/userfunc.c
+++ b/src/nvim/eval/userfunc.c
@@ -2576,10 +2576,14 @@ void ex_function(exarg_T *eap)
       //       and ":let [a, b] =<< [trim] EOF"
       arg = p;
       if (checkforcmd(&arg, "let", 2)) {
-        while (vim_strchr("$@&", *arg) != NULL) {
-          arg++;
+        int var_count = 0;
+        int semicolon = 0;
+        const char *argend = skip_var_list(arg, &var_count, &semicolon, true);
+        if (argend == NULL) {
+          // Invalid list assignment: skip to closing bracket.
+          argend = find_name_end(arg, NULL, NULL, FNE_INCL_BR);
         }
-        arg = skipwhite(find_name_end(arg, NULL, NULL, FNE_INCL_BR));
+        arg = skipwhite(argend);
         if (arg[0] == '=' && arg[1] == '<' && arg[2] == '<') {
           p = skipwhite(arg + 3);
           while (true) {