patch 8.0.0867: job and channel in a dict value not quoted
Problem: When using a job or channel value as a dict value, when turning it
into a string the quotes are missing.
Solution: Add quotes to the job and channel values. (Yasuhiro Matsumoto,
closes #1930)
diff --git a/src/eval.c b/src/eval.c
index c35def0..b8e6064 100644
--- a/src/eval.c
+++ b/src/eval.c
@@ -5683,9 +5683,9 @@
* If the memory is allocated "tofree" is set to it, otherwise NULL.
* "numbuf" is used for a number.
* When "copyID" is not NULL replace recursive lists and dicts with "...".
- * When both "echo_style" and "dict_val" are FALSE, put quotes around stings as
- * "string()", otherwise does not put quotes around strings, as ":echo"
- * displays values.
+ * When both "echo_style" and "composite_val" are FALSE, put quotes around
+ * stings as "string()", otherwise does not put quotes around strings, as
+ * ":echo" displays values.
* When "restore_copyID" is FALSE, repeated items in dictionaries and lists
* are replaced with "...".
* May return NULL.
@@ -5698,7 +5698,7 @@
int copyID,
int echo_style,
int restore_copyID,
- int dict_val)
+ int composite_val)
{
static int recurse = 0;
char_u *r = NULL;
@@ -5721,10 +5721,12 @@
switch (tv->v_type)
{
case VAR_STRING:
- if (echo_style && !dict_val)
+ if (echo_style && !composite_val)
{
*tofree = NULL;
- r = get_tv_string_buf(tv, numbuf);
+ r = tv->vval.v_string;
+ if (r == NULL)
+ r = (char_u *)"";
}
else
{
@@ -5841,10 +5843,19 @@
case VAR_NUMBER:
case VAR_UNKNOWN:
+ *tofree = NULL;
+ r = get_tv_string_buf(tv, numbuf);
+ break;
+
case VAR_JOB:
case VAR_CHANNEL:
*tofree = NULL;
r = get_tv_string_buf(tv, numbuf);
+ if (composite_val)
+ {
+ *tofree = string_quote(r, FALSE);
+ r = *tofree;
+ }
break;
case VAR_FLOAT: