From a02c2e55c0ee0a6f2d3a897c06a396794b765a6c Mon Sep 17 00:00:00 2001
From: nicm <nicm>
Date: Tue, 21 Oct 2014 22:22:04 +0000
Subject: Only redraw pane when it has actually changed.

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

(limited to 'tmux.h')

diff --git a/tmux.h b/tmux.h
index 11803985..a8ea70dc 100644
--- a/tmux.h
+++ b/tmux.h
@@ -2116,7 +2116,7 @@ void		 window_destroy(struct window *);
 struct window_pane *window_get_active_at(struct window *, u_int, u_int);
 void		 window_set_active_at(struct window *, u_int, u_int);
 struct window_pane *window_find_string(struct window *, const char *);
-void		 window_set_active_pane(struct window *, struct window_pane *);
+int		 window_set_active_pane(struct window *, struct window_pane *);
 struct window_pane *window_add_pane(struct window *, u_int);
 void		 window_resize(struct window *, u_int, u_int);
 int		 window_zoom(struct window_pane *);
-- 
cgit 


From 68cb1c0e6b169c6765e0d52c5319fe4354edaf09 Mon Sep 17 00:00:00 2001
From: nicm <nicm>
Date: Wed, 22 Oct 2014 23:11:41 +0000
Subject: Merge unlink-window into kill-window.

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

(limited to 'tmux.h')

diff --git a/tmux.h b/tmux.h
index a8ea70dc..adba24d2 100644
--- a/tmux.h
+++ b/tmux.h
@@ -2296,6 +2296,7 @@ struct session_group *session_group_find(struct session *);
 u_int		 session_group_index(struct session_group *);
 void		 session_group_add(struct session *, struct session *);
 void		 session_group_remove(struct session *);
+u_int		 session_group_count(struct session_group *);
 void		 session_group_synchronize_to(struct session *);
 void		 session_group_synchronize_from(struct session *);
 void		 session_group_synchronize1(struct session *, struct session *);
-- 
cgit 


From b496b1fe11b99614e407d02edb1a21905f384929 Mon Sep 17 00:00:00 2001
From: nicm <nicm>
Date: Mon, 27 Oct 2014 22:23:47 +0000
Subject: Move cfg_causes local into cfg.c and remove struct causelist.

---
 tmux.h | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

(limited to 'tmux.h')

diff --git a/tmux.h b/tmux.h
index adba24d2..d310c7af 100644
--- a/tmux.h
+++ b/tmux.h
@@ -381,9 +381,6 @@ struct tty_term_code_entry {
 	const char	       *name;
 };
 
-/* List of error causes. */
-ARRAY_DECL(causelist, char *);
-
 /* Message codes. */
 enum msgtype {
 	MSG_VERSION = 12,
@@ -1500,10 +1497,11 @@ __dead void	 shell_exec(const char *, const char *);
 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_add_cause(const char *, ...);
+void		 cfg_print_causes(struct cmd_q *);
 void		 cfg_show_causes(struct session *);
 
 /* format.c */
-- 
cgit