diff options
| author |   nicm <nicm@openbsd.org> | 2019-04-26 11:38:51 +0000 |
|---|---|---|
| committer | nicm <nicm@openbsd.org> | 2019-04-26 11:38:51 +0000 |
| commit | 844b90939180f829383791b640a09b536dd31ada (patch) | |
| tree | 71464a5121f3b392fccbfdcf56806488bb3a3d98 /usr.bin/tmux/tmux.c | |
| parent | Destroy panes before options to avoid crash when forced into a mode by a (diff) | |
| download | wireguard-openbsd-844b90939180f829383791b640a09b536dd31ada.tar.xz wireguard-openbsd-844b90939180f829383791b640a09b536dd31ada.zip | |
Merge hooks into options and make each one an array option. This allows
multiple commands to be easily bound to one hook. set-hook and
show-hooks remain but they are now variants of set-option and
show-options. show-options now has a -H flag to show hooks (by default
they are not shown).
Diffstat (limited to 'usr.bin/tmux/tmux.c')
| -rw-r--r-- | usr.bin/tmux/tmux.c | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/usr.bin/tmux/tmux.c b/usr.bin/tmux/tmux.c index b12fda88cd6..e837961022b 100644 --- a/usr.bin/tmux/tmux.c +++ b/usr.bin/tmux/tmux.c @@ -1,4 +1,4 @@ -/* $OpenBSD: tmux.c,v 1.187 2018/11/22 10:36:40 nicm Exp $ */ +/* $OpenBSD: tmux.c,v 1.188 2019/04/26 11:38:51 nicm Exp $ */ /* * Copyright (c) 2007 Nicholas Marriott <nicholas.marriott@gmail.com> @@ -39,7 +39,6 @@ struct options *global_options; /* server options */ struct options *global_s_options; /* session options */ struct options *global_w_options; /* window options */ struct environ *global_environ; -struct hooks *global_hooks; struct timeval start_time; const char *socket_path; @@ -312,8 +311,6 @@ main(int argc, char **argv) flags |= CLIENT_UTF8; } - global_hooks = hooks_create(NULL); - global_environ = environ_create(); for (var = environ; *var != NULL; var++) environ_put(global_environ, *var); |