From e128c7fcd8441f3fa885eafc9328f0937cc7384c Mon Sep 17 00:00:00 2001
From: nicm <nicm>
Date: Mon, 20 May 2019 11:46:06 +0000
Subject: Replace the various identical error callbacks with a single one in
 cmd-queue.c.

---
 tmux.h | 1 +
 1 file changed, 1 insertion(+)

(limited to 'tmux.h')

diff --git a/tmux.h b/tmux.h
index 4317bf0b..c87c797c 100644
--- a/tmux.h
+++ b/tmux.h
@@ -1983,6 +1983,7 @@ struct cmdq_item *cmdq_get_command(struct cmd_list *, struct cmd_find_state *,
 		     struct mouse_event *, int);
 #define cmdq_get_callback(cb, data) cmdq_get_callback1(#cb, cb, data)
 struct cmdq_item *cmdq_get_callback1(const char *, cmdq_cb, void *);
+struct cmdq_item *cmdq_get_error(const char *);
 void		 cmdq_insert_after(struct cmdq_item *, struct cmdq_item *);
 void		 cmdq_append(struct client *, struct cmdq_item *);
 void		 cmdq_insert_hook(struct session *, struct cmdq_item *,
-- 
cgit 


From 87d82170a615007bbd2f880765f222dd5c263000 Mon Sep 17 00:00:00 2001
From: nicm <nicm>
Date: Mon, 20 May 2019 13:23:32 +0000
Subject: Fix ordering of source-file with multiple files and add flags to
 load_cfg.

---
 tmux.h | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

(limited to 'tmux.h')

diff --git a/tmux.h b/tmux.h
index c87c797c..2979a6e3 100644
--- a/tmux.h
+++ b/tmux.h
@@ -1671,8 +1671,10 @@ void	proc_toggle_log(struct tmuxproc *);
 /* cfg.c */
 extern int cfg_finished;
 extern struct client *cfg_client;
+#define CFG_QUIET 0x1
 void	start_cfg(void);
-int	load_cfg(const char *, struct client *, struct cmdq_item *, int);
+int	load_cfg(const char *, struct client *, struct cmdq_item *, int,
+	    struct cmdq_item **);
 void	set_cfg_file(const char *);
 void printflike(1, 2) cfg_add_cause(const char *, ...);
 void	cfg_print_causes(struct cmdq_item *);
-- 
cgit