summaryrefslogtreecommitdiff
path: root/usr.bin
diff options
context:
space:
mode:
authorNicholas Marriott <nicm@cvs.openbsd.org>2016-05-04 21:29:48 +0000
committerNicholas Marriott <nicm@cvs.openbsd.org>2016-05-04 21:29:48 +0000
commit34287a5c23e9b3e4e0ece8d1f68b51d7680e7dc7 (patch)
tree440102ab1496e62924ffe6ce7b35414ca18f643b /usr.bin
parent9a7154a00136ef59e61fbed1fa3bedb6b0617578 (diff)
Fix up a couple of long lines.
Diffstat (limited to 'usr.bin')
-rw-r--r--usr.bin/tmux/options-table.c5
-rw-r--r--usr.bin/tmux/tmux.c5
2 files changed, 5 insertions, 5 deletions
diff --git a/usr.bin/tmux/options-table.c b/usr.bin/tmux/options-table.c
index beed897a564..5914176356f 100644
--- a/usr.bin/tmux/options-table.c
+++ b/usr.bin/tmux/options-table.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: options-table.c,v 1.72 2016/04/29 15:00:48 nicm Exp $ */
+/* $OpenBSD: options-table.c,v 1.73 2016/05/04 21:29:47 nicm Exp $ */
/*
* Copyright (c) 2011 Nicholas Marriott <nicholas.marriott@gmail.com>
@@ -699,7 +699,8 @@ const struct options_table_entry options_table[] = {
{ .name = "pane-border-format",
.type = OPTIONS_TABLE_STRING,
.scope = OPTIONS_TABLE_WINDOW,
- .default_str = "#{?pane_active,#[reverse],}#{pane_index}#[default] \"#{pane_title}\""
+ .default_str = "#{?pane_active,#[reverse],}#{pane_index}#[default] "
+ "\"#{pane_title}\""
},
{ .name = "pane-border-status",
diff --git a/usr.bin/tmux/tmux.c b/usr.bin/tmux/tmux.c
index e9d4c2ed219..fc6572de684 100644
--- a/usr.bin/tmux/tmux.c
+++ b/usr.bin/tmux/tmux.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: tmux.c,v 1.168 2016/03/05 16:08:38 nicm Exp $ */
+/* $OpenBSD: tmux.c,v 1.169 2016/05/04 21:29:47 nicm Exp $ */
/*
* Copyright (c) 2007 Nicholas Marriott <nicholas.marriott@gmail.com>
@@ -193,8 +193,7 @@ main(int argc, char **argv)
if (setlocale(LC_CTYPE, "") == NULL)
errx(1, "invalid LC_ALL, LC_CTYPE or LANG");
s = nl_langinfo(CODESET);
- if (strcasecmp(s, "UTF-8") != 0 &&
- strcasecmp(s, "UTF8") != 0)
+ if (strcasecmp(s, "UTF-8") != 0 && strcasecmp(s, "UTF8") != 0)
errx(1, "need UTF-8 locale (LC_CTYPE) but have %s", s);
}