From f518a077b176e65a30a187af21b00b0b9031dad7 Mon Sep 17 00:00:00 2001
From: nicm <nicm>
Date: Mon, 11 Aug 2014 22:14:30 +0000
Subject: Add flags to selectp to enable and disable input to a pane, from
 Anish Athalye.

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

(limited to 'tmux.h')

diff --git a/tmux.h b/tmux.h
index 614b7077..a0cbbd41 100644
--- a/tmux.h
+++ b/tmux.h
@@ -956,6 +956,7 @@ struct window_pane {
 #define PANE_FOCUSED 0x4
 #define PANE_RESIZE 0x8
 #define PANE_FOCUSPUSH 0x10
+#define PANE_INPUTOFF 0x20
 
 	int		 argc;
 	char	       **argv;
-- 
cgit 


From 29d20a55b645600feca1b54a13333e598336dad2 Mon Sep 17 00:00:00 2001
From: nicm <nicm>
Date: Mon, 11 Aug 2014 22:18:16 +0000
Subject: Fix two copy mode problems:

1. In vi mode the selection doesn't include the last character if you
   moved the cursor up or left.
2. In emacs mode the selection includes the last character if you moved
   the cursor to the left.

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

(limited to 'tmux.h')

diff --git a/tmux.h b/tmux.h
index a0cbbd41..bfc70544 100644
--- a/tmux.h
+++ b/tmux.h
@@ -794,6 +794,7 @@ LIST_HEAD(joblist, job);
 struct screen_sel {
 	int		 flag;
 	int		 rectflag;
+	int		 modekeys;
 
 	u_int		 sx;
 	u_int		 sy;
-- 
cgit 


From 4e956d545a52fe6b8310cfb30a26a89976d55cd9 Mon Sep 17 00:00:00 2001
From: nicm <nicm>
Date: Mon, 1 Sep 2014 21:50:18 +0000
Subject: Various minor style and spacing nits.

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

(limited to 'tmux.h')

diff --git a/tmux.h b/tmux.h
index bfc70544..c64459ba 100644
--- a/tmux.h
+++ b/tmux.h
@@ -2325,7 +2325,7 @@ void	set_signals(void(*)(int, short, void *));
 void	clear_signals(int);
 
 /* control.c */
-void	control_callback(struct client *, int, void*);
+void	control_callback(struct client *, int, void *);
 void printflike2 control_write(struct client *, const char *, ...);
 void	control_write_buffer(struct client *, struct evbuffer *);
 
-- 
cgit 


From 733cea8847fadf922e239f05b4cdd8afc2f6c943 Mon Sep 17 00:00:00 2001
From: nicm <nicm>
Date: Mon, 1 Sep 2014 21:58:41 +0000
Subject: Wake up any clients waiting with the wait-for command when the server
 exits.

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

(limited to 'tmux.h')

diff --git a/tmux.h b/tmux.h
index c64459ba..9be247f8 100644
--- a/tmux.h
+++ b/tmux.h
@@ -1924,6 +1924,9 @@ void		 cmdq_flush(struct cmd_q *);
 int	cmd_string_parse(const char *, struct cmd_list **, const char *,
 	    u_int, char **);
 
+/* cmd-wait-for.c */
+void	cmd_wait_for_flush(void);
+
 /* client.c */
 int	client_main(int, char **, int);
 
-- 
cgit