diff options
| author | Thomas Adam <thomas@xteddy.org> | 2016-05-05 00:01:11 +0100 |
|---|---|---|
| committer | Thomas Adam <thomas@xteddy.org> | 2016-05-05 00:01:11 +0100 |
| commit | f4648c1ca1e2a42ace541555387d2b66ff717dde (patch) | |
| tree | ca1adba95f960865a09e0769f9eb858f9fcb1284 | |
| parent | ce1ec90fcc73110ca319c0e0a7823f84fd6286de (diff) | |
| parent | 9f045787a5b12a8ee19a3cf29432a41cec4d2158 (diff) | |
| download | rtmux-f4648c1ca1e2a42ace541555387d2b66ff717dde.tar.gz rtmux-f4648c1ca1e2a42ace541555387d2b66ff717dde.tar.bz2 rtmux-f4648c1ca1e2a42ace541555387d2b66ff717dde.zip | |
Merge branch 'obsd-master'
| -rw-r--r-- | options-table.c | 3 | ||||
| -rw-r--r-- | tmux.c | 3 |
2 files changed, 3 insertions, 3 deletions
diff --git a/options-table.c b/options-table.c index ec68931d..4898e550 100644 --- a/options-table.c +++ b/options-table.c @@ -698,7 +698,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", @@ -196,8 +196,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); } |