From bf35441608b05d52627215aa70bd52d9460812d4 Mon Sep 17 00:00:00 2001
From: nicm <nicm>
Date: Sun, 20 Oct 2013 17:28:43 +0000
Subject: Do not run any command line command from the client which starts the
 server until after the configuration file completes. This prevents it racing
 against run-shell or if-shell in .tmux.conf that run in the background.

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

(limited to 'tmux.h')

diff --git a/tmux.h b/tmux.h
index 67192740..ddee0730 100644
--- a/tmux.h
+++ b/tmux.h
@@ -1510,6 +1510,7 @@ extern struct cmd_q *cfg_cmd_q;
 extern int cfg_finished;
 extern int cfg_references;
 extern struct causelist cfg_causes;
+extern struct client *cfg_client;
 int		 load_cfg(const char *, struct cmd_q *, char **);
 void		 cfg_default_done(struct cmd_q *);
 void		 cfg_show_causes(struct session *);
-- 
cgit 


From 7fa55b0419b88b5568bb2fd99dd0de9fba80ac61 Mon Sep 17 00:00:00 2001
From: nicm <nicm>
Date: Wed, 23 Oct 2013 11:31:03 +0000
Subject: Key to swap to other end of selection (bound to o with vi keys), from
 J Raynor.

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

(limited to 'tmux.h')

diff --git a/tmux.h b/tmux.h
index ddee0730..81c99f9b 100644
--- a/tmux.h
+++ b/tmux.h
@@ -564,6 +564,7 @@ enum mode_key_cmd {
 	MODEKEYCOPY_NEXTSPACEEND,
 	MODEKEYCOPY_NEXTWORD,
 	MODEKEYCOPY_NEXTWORDEND,
+	MODEKEYCOPY_OTHEREND,
 	MODEKEYCOPY_PREVIOUSPAGE,
 	MODEKEYCOPY_PREVIOUSSPACE,
 	MODEKEYCOPY_PREVIOUSWORD,
-- 
cgit