diff options
| author |   nicm <nicm@openbsd.org> | 2012-01-21 08:40:09 +0000 |
|---|---|---|
| committer | nicm <nicm@openbsd.org> | 2012-01-21 08:40:09 +0000 |
| commit | f193b8ed5c0ec20345e0f1ce456ee30fb477038a (patch) | |
| tree | 952a8f9ca3bacd4559133ef7bc6429712a0b4c29 /usr.bin/tmux/tmux.c | |
| parent | Add strings to allow the aixterm bright colours to be used when (diff) | |
| download | wireguard-openbsd-f193b8ed5c0ec20345e0f1ce456ee30fb477038a.tar.xz wireguard-openbsd-f193b8ed5c0ec20345e0f1ce456ee30fb477038a.zip | |
Drop the ability to have a list of keys in the prefix in favour of two
separate options, prefix and prefix2. This simplifies the code and gets
rid the data options type which was only used for this one option.
Also add a -2 flag to send-prefix to send the secondary prefix key,
fixing a cause of minor irritation.
People who want three prefix keys are out of luck :-).
Diffstat (limited to 'usr.bin/tmux/tmux.c')
| -rw-r--r-- | usr.bin/tmux/tmux.c | 9 |
1 files changed, 1 insertions, 8 deletions
diff --git a/usr.bin/tmux/tmux.c b/usr.bin/tmux/tmux.c index ebb3b91a3cd..1cb7364f11c 100644 --- a/usr.bin/tmux/tmux.c +++ b/usr.bin/tmux/tmux.c @@ -1,4 +1,4 @@ -/* $OpenBSD: tmux.c,v 1.107 2011/10/23 08:34:01 nicm Exp $ */ +/* $OpenBSD: tmux.c,v 1.108 2012/01/21 08:40:09 nicm Exp $ */ /* * Copyright (c) 2007 Nicholas Marriott <nicm@users.sourceforge.net> @@ -232,7 +232,6 @@ int main(int argc, char **argv) { struct passwd *pw; - struct keylist *keylist; char *s, *path, *label, *home, **var; int opt, flags, quiet, keys; @@ -329,12 +328,6 @@ main(int argc, char **argv) options_init(&global_w_options, NULL); options_table_populate_tree(window_options_table, &global_w_options); - /* Set the prefix option (its a list, so not in the table). */ - keylist = xmalloc(sizeof *keylist); - ARRAY_INIT(keylist); - ARRAY_ADD(keylist, '\002'); - options_set_data(&global_s_options, "prefix", keylist, xfree); - /* Enable UTF-8 if the first client is on UTF-8 terminal. */ if (flags & IDENTIFY_UTF8) { options_set_number(&global_s_options, "status-utf8", 1); |