From 71fc9f3ee8753a2bb163c85c784936a8d6d3e0ac Mon Sep 17 00:00:00 2001
From: nicm <nicm>
Date: Wed, 7 Apr 2021 12:50:12 +0000
Subject: Add a current_file format for the config file being parsed.
 Originally suggested by kn@, also GitHub issue 2638.

---
 cmd-queue.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'cmd-queue.c')

diff --git a/cmd-queue.c b/cmd-queue.c
index 05f439f5..a0d80c34 100644
--- a/cmd-queue.c
+++ b/cmd-queue.c
@@ -276,7 +276,7 @@ cmdq_merge_formats(struct cmdq_item *item, struct format_tree *ft)
 	const struct cmd_entry	*entry;
 
 	if (item->cmd != NULL) {
-		entry = cmd_get_entry (item->cmd);
+		entry = cmd_get_entry(item->cmd);
 		format_add(ft, "command", "%s", entry->name);
 	}
 	if (item->state->formats != NULL)
-- 
cgit 


From e6abe55134df1b9dc3b7dd7f3a65dff272a35bb7 Mon Sep 17 00:00:00 2001
From: nicm <nicm>
Date: Mon, 12 Apr 2021 09:36:12 +0000
Subject: Add a flag to disable keys to close a message, GitHub issue 2625.

---
 cmd-queue.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'cmd-queue.c')

diff --git a/cmd-queue.c b/cmd-queue.c
index a0d80c34..54163919 100644
--- a/cmd-queue.c
+++ b/cmd-queue.c
@@ -862,7 +862,7 @@ cmdq_error(struct cmdq_item *item, const char *fmt, ...)
 		c->retval = 1;
 	} else {
 		*msg = toupper((u_char) *msg);
-		status_message_set(c, -1, 1, "%s", msg);
+		status_message_set(c, -1, 1, 0, "%s", msg);
 	}
 
 	free(msg);
-- 
cgit