summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRoland Walker <walker@pobox.com>2017-07-01 14:55:47 -0400
committerJonas Fonseca <jonas.fonseca@gmail.com>2017-07-03 23:02:13 -0400
commit1a56e0091424ab126c44428f2eeebbebe0dd43ad (patch)
treef929458967ae32e80d966e51bf31e2bd93fbc08d
parent440d03db3d5d8bd835206772c8e5a2309faa4836 (diff)
expand tig variables in echo action
-rw-r--r--src/prompt.c9
1 files changed, 7 insertions, 2 deletions
diff --git a/src/prompt.c b/src/prompt.c
index ca98b085..40fc3db4 100644
--- a/src/prompt.c
+++ b/src/prompt.c
@@ -860,10 +860,15 @@ run_prompt_command(struct view *view, const char *argv[])
return REQ_NONE;
} else if (!strcmp(cmd, "echo")) {
+ const char **fmt_argv = NULL;
char text[SIZEOF_STR] = "";
- if (argv[1] && !argv_to_string(&argv[1], text, sizeof(text), " ")) {
- report("Failed to copy echo string");
+ if (argv[1]
+ && strlen(argv[1]) > 0
+ && (!argv_format(view->env, &fmt_argv, &argv[1], false, true)
+ || !argv_to_string(fmt_argv, text, sizeof(text), " ")
+ )) {
+ report("Failed to format echo string");
return REQ_NONE;
}