1 files changed, 31 insertions, 20 deletions

diff --git a/src/nvim/eval.c b/src/nvim/eval.c
index 6dd0b8cb4a..36303d8313 100644
--- a/src/nvim/eval.c
+++ b/src/nvim/eval.c
@@ -9428,12 +9428,16 @@ static void f_function(typval_T *argvars, typval_T *rettv, FunPtr fptr)
   char_u      *name;
 
   s = get_tv_string(&argvars[0]);
-  if (s == NULL || *s == NUL || ascii_isdigit(*s))
+  if (s == NULL || *s == NUL || ascii_isdigit(*s)) {
     EMSG2(_(e_invarg2), s);
-  /* Don't check an autoload name for existence here. */
-  else if (vim_strchr(s, AUTOLOAD_CHAR) == NULL && !function_exists(s))
+  } else if (vim_strchr(s, AUTOLOAD_CHAR) == NULL && !function_exists(s)) {
+    // Don't check an autoload name for existence here.
     EMSG2(_("E700: Unknown function: %s"), s);
-  else {
+  } else {
+    int dict_idx = 0;
+    int arg_idx = 0;
+    list_T *list = NULL;
+
     if (STRNCMP(s, "s:", 2) == 0 || STRNCMP(s, "<SID>", 5) == 0) {
       char sid_buf[25];
       int off = *s == 's' ? 2 : 5;
@@ -9454,10 +9458,6 @@ static void f_function(typval_T *argvars, typval_T *rettv, FunPtr fptr)
     }
 
     if (argvars[1].v_type != VAR_UNKNOWN) {
-      partial_T *pt;
-      int dict_idx = 0;
-      int arg_idx = 0;
-
       if (argvars[2].v_type != VAR_UNKNOWN) {
         // function(name, [args], dict)
         arg_idx = 1;
@@ -9469,23 +9469,34 @@ static void f_function(typval_T *argvars, typval_T *rettv, FunPtr fptr)
         // function(name, [args])
         arg_idx = 1;
       }
-      if (dict_idx > 0 && (argvars[dict_idx].v_type != VAR_DICT
-                           || argvars[dict_idx].vval.v_dict == NULL)) {
-        EMSG(_("E922: expected a dict"));
-        xfree(name);
-        return;
+      if (dict_idx > 0) {
+        if (argvars[dict_idx].v_type != VAR_DICT) {
+          EMSG(_("E922: expected a dict"));
+          xfree(name);
+          return;
+        }
+        if (argvars[dict_idx].vval.v_dict == NULL) {
+          dict_idx = 0;
+        }
       }
-      if (arg_idx > 0 && (argvars[arg_idx].v_type != VAR_LIST
-                          || argvars[arg_idx].vval.v_list == NULL)) {
-        EMSG(_("E923: Second argument of function() must be a list or a dict"));
-        xfree(name);
-        return;
+      if (arg_idx > 0) {
+        if (argvars[arg_idx].v_type != VAR_LIST) {
+          EMSG(_("E923: Second argument of function() must be"
+                 "a list or a dict"));
+          xfree(name);
+          return;
+        }
+        list = argvars[arg_idx].vval.v_list;
+        if (list == NULL || list->lv_len == 0) {
+          arg_idx = 0;
+        }
       }
+    }
+    if (dict_idx > 0 || arg_idx > 0) {
+      partial_T *pt = (partial_T *)xcalloc(1, sizeof(partial_T));
 
-      pt = (partial_T *)xcalloc(1, sizeof(partial_T));
       if (pt != NULL) {
         if (arg_idx > 0) {
-          list_T *list = argvars[arg_idx].vval.v_list;
           listitem_T *li;
           int i = 0;