From a3de5dbab1680528d622a5054075e3d8efced795 Mon Sep 17 00:00:00 2001
From: nicm <nicm>
Date: Fri, 11 Sep 2015 14:41:50 +0000
Subject: Merge delete-buffer into cmd-set-buffer.c and change the paste buffer
 API so it has one paste_free() rather than free_top and free_name (everywhere
 that uses it already has the right pointer).

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

(limited to 'tmux.h')

diff --git a/tmux.h b/tmux.h
index 8cd83e27..a8cd8532 100644
--- a/tmux.h
+++ b/tmux.h
@@ -1435,8 +1435,7 @@ const char	*paste_buffer_data(struct paste_buffer *, size_t *);
 struct paste_buffer *paste_walk(struct paste_buffer *);
 struct paste_buffer *paste_get_top(const char **);
 struct paste_buffer *paste_get_name(const char *);
-int		 paste_free_top(void);
-int		 paste_free_name(const char *);
+void		 paste_free(struct paste_buffer *);
 void		 paste_add(char *, size_t);
 int		 paste_rename(const char *, const char *, char **);
 int		 paste_set(char *, size_t, const char *, char **);
-- 
cgit 


From 901c2eb20a7066b743c9c6cdde0766737f7c079f Mon Sep 17 00:00:00 2001
From: nicm <nicm>
Date: Sun, 13 Sep 2015 13:31:40 +0000
Subject: Add copy-mode -e to exit copy mode when scrolling off the bottom,
 useful for quick view of history, from Cam Hutchison.

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

(limited to 'tmux.h')

diff --git a/tmux.h b/tmux.h
index a8cd8532..080d670d 100644
--- a/tmux.h
+++ b/tmux.h
@@ -2068,7 +2068,7 @@ extern const char window_clock_table[14][5][5];
 
 /* window-copy.c */
 extern const struct window_mode window_copy_mode;
-void		 window_copy_init_from_pane(struct window_pane *);
+void		 window_copy_init_from_pane(struct window_pane *, u_int);
 void		 window_copy_init_for_output(struct window_pane *);
 void printflike(2, 3) window_copy_add(struct window_pane *, const char *, ...);
 void		 window_copy_vadd(struct window_pane *, const char *, va_list);
-- 
cgit 


From 16efa8483888e326aed2c05a01b63b45a2b118ef Mon Sep 17 00:00:00 2001
From: nicm <nicm>
Date: Mon, 14 Sep 2015 10:25:52 +0000
Subject: Make refresh-client force update of jobs, from Sina Siadat.

---
 tmux.h | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

(limited to 'tmux.h')

diff --git a/tmux.h b/tmux.h
index 080d670d..e5523418 100644
--- a/tmux.h
+++ b/tmux.h
@@ -1220,6 +1220,7 @@ struct client {
 #define CLIENT_UTF8 0x10000
 #define CLIENT_256COLOURS 0x20000
 #define CLIENT_IDENTIFIED 0x40000
+#define CLIENT_STATUSFORCE 0x80000
 	int		 flags;
 	struct key_table *keytable;
 
@@ -1442,9 +1443,11 @@ int		 paste_set(char *, size_t, const char *, char **);
 char		*paste_make_sample(struct paste_buffer *, int);
 
 /* format.c */
+#define FORMAT_STATUS 0x1
+#define FORMAT_FORCE 0x2
 struct format_tree;
 struct format_tree *format_create(void);
-struct format_tree *format_create_status(int);
+struct format_tree *format_create_flags(int);
 void		 format_free(struct format_tree *);
 void printflike(3, 4) format_add(struct format_tree *, const char *,
 		     const char *, ...);
-- 
cgit