vim: src/eval.c comparison

updated for version 7.4.243 Problem: Cannot use setreg() to add text that includes a NUL. Solution: Make setreg() accept a list.

comparison

equal deleted inserted replaced

-:fa96ffb832d8
+:9f8fa56f1906
 if (strregname == NULL)
 	return;		/* type error; errmsg already given */
 regname = *strregname;
 if (regname == 0 || regname == '@')
 	regname = '"';
-else if (regname == '=')
-	return;
 if (argvars[2].v_type != VAR_UNKNOWN)
 {
 	stropt = get_tv_string_chk(&argvars[2]);
 	if (stropt == NULL)
 		    }
 		    break;
 	    }
 }
-strval = get_tv_string_chk(&argvars[1]);
+if (argvars[1].v_type == VAR_LIST)
-if (strval != NULL)
+{
+	char_u		**lstval;
+	char_u		**curval;
+	int		len = argvars[1].vval.v_list->lv_len;
+	listitem_T	*li;
+	lstval = (char_u **)alloc(sizeof(char_u *) * (len + 1));
+	if (lstval == NULL)
+	    return;
+	curval = lstval;
+	for (li = argvars[1].vval.v_list->lv_first; li != NULL;
+							     li = li->li_next)
+	{
+	    /* TODO: this may use a static buffer several times. */
+	    strval = get_tv_string_chk(&li->li_tv);
+	    if (strval == NULL)
+	    {
+		vim_free(lstval);
+		return;
+	    }
+	    *curval++ = strval;
+	}
+	*curval++ = NULL;
+	write_reg_contents_lst(regname, lstval, -1,
+						append, yank_type, block_len);
+	vim_free(lstval);
+}
+else
+{
+	strval = get_tv_string_chk(&argvars[1]);
+	if (strval == NULL)
+	    return;
 	write_reg_contents_ex(regname, strval, -1,
 						append, yank_type, block_len);
+}
 rettv->vval.v_number = 0;
 }
 /*
 * "settabvar()" function

Mercurial > vim