diff options
| -rw-r--r-- | usr.bin/tmux/options-table.c | 5 | ||||
| -rw-r--r-- | usr.bin/tmux/tty-term.c | 5 | ||||
| -rw-r--r-- | usr.bin/tmux/tty.c | 5 |
3 files changed, 9 insertions, 6 deletions
diff --git a/usr.bin/tmux/options-table.c b/usr.bin/tmux/options-table.c index 9341bd383ad..ca098c08525 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.49 2014/04/17 11:38:35 nicm Exp $ */ +/* $OpenBSD: options-table.c,v 1.50 2014/04/17 12:57:28 nicm Exp $ */ /* * Copyright (c) 2011 Nicholas Marriott <nicm@users.sourceforge.net> @@ -528,7 +528,8 @@ const struct options_table_entry window_options_table[] = { { .name = "automatic-rename-format", .type = OPTIONS_TABLE_STRING, - .default_str = "#{?pane_in_mode,[tmux],#{pane_current_command}}#{?pane_dead,[dead],}" + .default_str = "#{?pane_in_mode,[tmux],#{pane_current_command}}" + "#{?pane_dead,[dead],}" }, { .name = "c0-change-trigger", diff --git a/usr.bin/tmux/tty-term.c b/usr.bin/tmux/tty-term.c index 44a4ff93832..d0e1df8517f 100644 --- a/usr.bin/tmux/tty-term.c +++ b/usr.bin/tmux/tty-term.c @@ -1,4 +1,4 @@ -/* $OpenBSD: tty-term.c,v 1.33 2014/02/23 00:53:06 nicm Exp $ */ +/* $OpenBSD: tty-term.c,v 1.34 2014/04/17 12:57:28 nicm Exp $ */ /* * Copyright (c) 2008 Nicholas Marriott <nicm@users.sourceforge.net> @@ -506,7 +506,8 @@ tty_term_ptr1(struct tty_term *term, enum tty_code_code code, const void *a) } const char * -tty_term_ptr2(struct tty_term *term, enum tty_code_code code, const void *a, const void *b) +tty_term_ptr2(struct tty_term *term, enum tty_code_code code, const void *a, + const void *b) { return (tparm((char *) tty_term_string(term, code), a, b)); } diff --git a/usr.bin/tmux/tty.c b/usr.bin/tmux/tty.c index ae1cce2b1d6..9a16ebf0f8e 100644 --- a/usr.bin/tmux/tty.c +++ b/usr.bin/tmux/tty.c @@ -1,4 +1,4 @@ -/* $OpenBSD: tty.c,v 1.166 2014/02/23 00:53:06 nicm Exp $ */ +/* $OpenBSD: tty.c,v 1.167 2014/04/17 12:57:28 nicm Exp $ */ /* * Copyright (c) 2007 Nicholas Marriott <nicm@users.sourceforge.net> @@ -388,7 +388,8 @@ tty_putcode_ptr1(struct tty *tty, enum tty_code_code code, const void *a) } void -tty_putcode_ptr2(struct tty *tty, enum tty_code_code code, const void *a, const void *b) +tty_putcode_ptr2(struct tty *tty, enum tty_code_code code, const void *a, + const void *b) { if (a != NULL && b != NULL) tty_puts(tty, tty_term_ptr2(tty->term, code, a, b)); |