aboutsummaryrefslogtreecommitdiff
path: root/cmd-set-option.c
diff options
context:
space:
mode:
authorTiago Cunha <tcunha@gmx.com>2009-09-22 14:22:21 +0000
committerTiago Cunha <tcunha@gmx.com>2009-09-22 14:22:21 +0000
commitdf7b68480cf37f4039a5fd1809fd7c8dbf127277 (patch)
tree4e764c63c18a86cd683cabe5bdf1817d970dfb03 /cmd-set-option.c
parent31ccf2f8134538bd3f4b2bad0d092536b3adb519 (diff)
downloadrtmux-df7b68480cf37f4039a5fd1809fd7c8dbf127277.tar.gz
rtmux-df7b68480cf37f4039a5fd1809fd7c8dbf127277.tar.bz2
rtmux-df7b68480cf37f4039a5fd1809fd7c8dbf127277.zip
Sync OpenBSD patchset 343:
Permit multiple prefix keys to be defined, separated by commas, for example: set -g prefix ^a,^b Any key in the list acts as the prefix. The send-prefix command always sends the first key in the list.
Diffstat (limited to 'cmd-set-option.c')
-rw-r--r--cmd-set-option.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/cmd-set-option.c b/cmd-set-option.c
index 283f3692..32a913aa 100644
--- a/cmd-set-option.c
+++ b/cmd-set-option.c
@@ -1,4 +1,4 @@
-/* $Id: cmd-set-option.c,v 1.79 2009-09-19 18:53:01 tcunha Exp $ */
+/* $Id: cmd-set-option.c,v 1.80 2009-09-22 14:22:20 tcunha Exp $ */
/*
* Copyright (c) 2007 Nicholas Marriott <nicm@users.sourceforge.net>
@@ -65,7 +65,7 @@ const struct set_option_entry set_option_table[] = {
{ "message-attr", SET_OPTION_ATTRIBUTES, 0, 0, NULL },
{ "message-bg", SET_OPTION_COLOUR, 0, 0, NULL },
{ "message-fg", SET_OPTION_COLOUR, 0, 0, NULL },
- { "prefix", SET_OPTION_KEY, 0, 0, NULL },
+ { "prefix", SET_OPTION_KEYS, 0, 0, NULL },
{ "repeat-time", SET_OPTION_NUMBER, 0, SHRT_MAX, NULL },
{ "set-remain-on-exit", SET_OPTION_FLAG, 0, 0, NULL },
{ "set-titles", SET_OPTION_FLAG, 0, 0, NULL },
@@ -162,8 +162,8 @@ cmd_set_option_exec(struct cmd *self, struct cmd_ctx *ctx)
case SET_OPTION_NUMBER:
set_option_number(ctx, oo, entry, data->arg2);
break;
- case SET_OPTION_KEY:
- set_option_key(ctx, oo, entry, data->arg2);
+ case SET_OPTION_KEYS:
+ set_option_keys(ctx, oo, entry, data->arg2);
break;
case SET_OPTION_COLOUR:
set_option_colour(ctx, oo, entry, data->arg2);