From: nicm <nicm@openbsd.org>
Date: Mon, 29 Nov 2021 11:01:51 +0000 (+0000)
Subject: Fix user option lookup ordering.
X-Git-Url: http://artulab.com/gitweb/?a=commitdiff_plain;h=95143b6ede6226cd4cd45b6062397afd50bfcea3;p=openbsd

Fix user option lookup ordering.
---

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)