===================================================================
RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/tmux/server.c,v
retrieving revision 1.128
retrieving revision 1.129
diff -u -r1.128 -r1.129
--- src/usr.bin/tmux/server.c	2015/06/05 18:18:32	1.128
+++ src/usr.bin/tmux/server.c	2015/07/20 15:50:04	1.129
@@ -1,4 +1,4 @@
-/* $OpenBSD: server.c,v 1.128 2015/06/05 18:18:32 nicm Exp $ */
+/* $OpenBSD: server.c,v 1.129 2015/07/20 15:50:04 nicm Exp $ */
 
 /*
  * Copyright (c) 2007 Nicholas Marriott <nicm@users.sourceforge.net>
@@ -240,6 +240,7 @@
 			cfg_add_cause("%s: %s", cfg_file, cause);
 	}
 	cmdq_continue(cfg_cmd_q);
+	status_prompt_load_history();
 
 	server_add_accept(0);
 
@@ -250,6 +251,7 @@
 
 	set_signals(server_signal_callback);
 	server_loop();
+	status_prompt_save_history();
 	exit(0);
 }