From: nicm <nicm@openbsd.org>
Date: Fri, 21 Apr 2017 14:04:54 +0000 (+0000)
Subject: History needs to be loaded after config parsing is done - now that
X-Git-Url: http://artulab.com/gitweb/?a=commitdiff_plain;h=aa908d99b4f6a999f3acf6a627e1cd562e185c4c;p=openbsd

History needs to be loaded after config parsing is done - now that
commands are queued, that's in cfg_done not after start_cfg finishes.
---

diff --git a/usr.bin/tmux/cfg.c b/usr.bin/tmux/cfg.c
index bc49bb9834c..e3b5389df45 100644
--- a/usr.bin/tmux/cfg.c
+++ b/usr.bin/tmux/cfg.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: cfg.c,v 1.56 2017/04/21 13:15:43 nicm Exp $ */
+/* $OpenBSD: cfg.c,v 1.57 2017/04/21 14:04:54 nicm Exp $ */
 
 /*
  * Copyright (c) 2008 Nicholas Marriott <nicholas.marriott@gmail.com>
@@ -43,6 +43,8 @@ cfg_done(__unused struct cmdq_item *item, __unused void *data)
 	if (!RB_EMPTY(&sessions))
 		cfg_show_causes(RB_MIN(sessions, &sessions));
 
+	status_prompt_load_history();
+
 	return (CMD_RETURN_NORMAL);
 }
 
diff --git a/usr.bin/tmux/server.c b/usr.bin/tmux/server.c
index 4421979ec55..005f4883830 100644
--- a/usr.bin/tmux/server.c
+++ b/usr.bin/tmux/server.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: server.c,v 1.167 2017/04/20 09:20:22 nicm Exp $ */
+/* $OpenBSD: server.c,v 1.168 2017/04/21 14:04:54 nicm Exp $ */
 
 /*
  * Copyright (c) 2007 Nicholas Marriott <nicholas.marriott@gmail.com>
@@ -176,8 +176,6 @@ server_start(struct event_base *base, int lockfd, char *lockfile)
 
 	start_cfg();
 
-	status_prompt_load_history();
-
 	server_add_accept(0);
 
 	proc_loop(server_proc, server_loop);