=================================================================== RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/tmux/cmd-show-options.c,v retrieving revision 1.63 retrieving revision 1.64 diff -u -r1.63 -r1.64 --- src/usr.bin/tmux/cmd-show-options.c 2020/04/13 20:54:15 1.63 +++ src/usr.bin/tmux/cmd-show-options.c 2020/05/16 16:02:24 1.64 @@ -1,4 +1,4 @@ -/* $OpenBSD: cmd-show-options.c,v 1.63 2020/04/13 20:54:15 nicm Exp $ */ +/* $OpenBSD: cmd-show-options.c,v 1.64 2020/05/16 16:02:24 nicm Exp $ */ /* * Copyright (c) 2007 Nicholas Marriott @@ -151,7 +151,7 @@ xasprintf(&tmp, "%s[%d]", name, idx); name = tmp; } else { - if (options_isarray(o)) { + if (options_is_array(o)) { a = options_array_first(o); if (a == NULL) { if (!args_has(args, 'v')) @@ -168,10 +168,10 @@ } } - value = options_tostring(o, idx, 0); + value = options_to_string(o, idx, 0); if (args_has(args, 'v')) cmdq_print(item, "%s", value); - else if (options_isstring(o)) { + else if (options_is_string(o)) { escaped = args_escape(value); if (parent) cmdq_print(item, "%s* %s", name, escaped); @@ -229,7 +229,7 @@ } else parent = 0; - if (!options_isarray(o)) + if (!options_is_array(o)) cmd_show_options_print(self, item, o, -1, parent); else if ((a = options_array_first(o)) == NULL) { if (!args_has(args, 'v')) {