diff options
author | Nicholas Marriott <nicholas.marriott@gmail.com> | 2013-05-15 16:50:15 +0100 |
---|---|---|
committer | Nicholas Marriott <nicholas.marriott@gmail.com> | 2013-05-15 16:50:15 +0100 |
commit | 907ad00300506c25ee84223811e25a411dc21517 (patch) | |
tree | ec84d431722e22820564b77157df41c11ccc25be /tmux.h | |
parent | 5b1cf02f2ea224922661495af32d46b024e28eef (diff) | |
parent | fce095665c62eb38826f42ae55a0fbe998f18be0 (diff) | |
download | rtmux-907ad00300506c25ee84223811e25a411dc21517.tar.gz rtmux-907ad00300506c25ee84223811e25a411dc21517.tar.bz2 rtmux-907ad00300506c25ee84223811e25a411dc21517.zip |
Merge branch 'master' of ssh://git.code.sf.net/p/tmux/tmux-code
Conflicts:
Makefile.am
Diffstat (limited to 'tmux.h')
-rw-r--r-- | tmux.h | 6 |
1 files changed, 2 insertions, 4 deletions
@@ -39,10 +39,6 @@ extern char *__progname; extern char **environ; -/* Default configuration files. */ -#define DEFAULT_CFG ".tmux.conf" -#define SYSTEM_CFG "/etc/tmux.conf" - /* Default prompt history length. */ #define PROMPT_HISTORY 100 @@ -2253,6 +2249,8 @@ struct window_choose_data *window_choose_add_item(struct window_pane *, struct client *, struct winlink *, const char *, const char *, u_int); void window_choose_expand_all(struct window_pane *); +void window_choose_collapse_all(struct window_pane *); +void window_choose_set_current(struct window_pane *, u_int); /* names.c */ void queue_window_name(struct window *); |