summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authornicm <nicm@openbsd.org>2017-01-15 20:14:36 +0000
committernicm <nicm@openbsd.org>2017-01-15 20:14:36 +0000
commitf11dd4789552e60415665e66c6d7ef221e8298c0 (patch)
treee052f6839e0c20778493bfe36ce0743da66edc2c
parentMake sure to also backup and restore the a4x bus space map function (diff)
downloadwireguard-openbsd-f11dd4789552e60415665e66c6d7ef221e8298c0.tar.xz
wireguard-openbsd-f11dd4789552e60415665e66c6d7ef221e8298c0.zip
Append needs to go old,new not new,old...
-rw-r--r--usr.bin/tmux/options.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/usr.bin/tmux/options.c b/usr.bin/tmux/options.c
index bfc2d10c678..24cc81ba139 100644
--- a/usr.bin/tmux/options.c
+++ b/usr.bin/tmux/options.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: options.c,v 1.24 2017/01/13 11:58:49 nicm Exp $ */
+/* $OpenBSD: options.c,v 1.25 2017/01/15 20:14:36 nicm Exp $ */
/*
* Copyright (c) 2008 Nicholas Marriott <nicholas.marriott@gmail.com>
@@ -151,7 +151,7 @@ options_set_string(struct options *oo, const char *name, int append,
if (o == NULL || !append)
value = s;
else {
- xasprintf(&value, "%s%s", s, o->str);
+ xasprintf(&value, "%s%s", o->str, s);
free(s);
}