Merge branch 'master' of github.com:tmux/tmux

1 files changed, 2 insertions, 0 deletions

diff --git a/server.c b/server.c
index d8f9fe48..ad69631d 100644
--- a/server.c
+++ b/server.c
@@ -241,6 +241,7 @@ server_start(int lockfd, char *lockfile)
 			cfg_add_cause("%s: %s", cfg_file, cause);
 	}
 	cmdq_continue(cfg_cmd_q);
+	status_prompt_load_history();
 
 	server_add_accept(0);
 
@@ -251,6 +252,7 @@ server_start(int lockfd, char *lockfile)
 
 	set_signals(server_signal_callback);
 	server_loop();
+	status_prompt_save_history();
 	exit(0);
 }