summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNicholas Marriott <nicm@cvs.openbsd.org>2021-11-29 11:01:52 +0000
committerNicholas Marriott <nicm@cvs.openbsd.org>2021-11-29 11:01:52 +0000
commit8edb9ff422dbe6baeb87bc629881114eb8f18633 (patch)
tree05237a60066ac78df912975674254d22ded00a06
parent39aa4bfebec924182edd0f0bb709479cf29d1140 (diff)
Fix user option lookup ordering.
-rw-r--r--usr.bin/tmux/window-customize.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/usr.bin/tmux/window-customize.c b/usr.bin/tmux/window-customize.c
index ea9dae79894..188f3f0af87 100644
--- a/usr.bin/tmux/window-customize.c
+++ b/usr.bin/tmux/window-customize.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: window-customize.c,v 1.12 2021/08/21 17:25:32 nicm Exp $ */
+/* $OpenBSD: window-customize.c,v 1.13 2021/11/29 11:01:51 nicm Exp $ */
/*
* Copyright (c) 2020 Nicholas Marriott <nicholas.marriott@gmail.com>
@@ -398,11 +398,11 @@ window_customize_build_options(struct window_customize_modedata *data,
for (i = 0; i < size; i++) {
if (oo2 != NULL)
- o = options_get(oo0, list[i]);
+ o = options_get(oo2, list[i]);
if (o == NULL && oo1 != NULL)
o = options_get(oo1, list[i]);
if (o == NULL)
- o = options_get(oo2, list[i]);
+ o = options_get(oo0, list[i]);
if (options_owner(o) == oo2)
scope = scope2;
else if (options_owner(o) == oo1)