Merge branch 'obsd-master'

format.c

@@ -5616,7 +5616,7 @@ format_expand1(struct format_expand_state *es, const char *fmt)
 	const char		*ptr, *s, *style_end = NULL;
 	size_t			 off, len, n, outlen;
 	int			 ch, brackets;
-	char			 expanded[8192], number[2] = { 0 };
+	char			 expanded[8192];
 
 	if (fmt == NULL || *fmt == '\0' || !format_check_time(es))
 		return (xstrdup(""));
@@ -5746,13 +5746,6 @@ format_expand1(struct format_expand_state *es, const char *fmt)
 			continue;
 		default:
 			s = NULL;
-			if (ch >= '1' && ch <= '9') {
-				number[0] = ch;
-				if (format_replace(es, number, 1, &buf, &len,
-				    &off) != 0)
-					break;
-				continue;
-			}
 			if (fmt > style_end) { /* skip inside #[] */
 				if (ch >= 'A' && ch <= 'Z')
 					s = format_upper[ch - 'A'];

tmux.1

@@ -7870,9 +7870,6 @@ section.
 If
 .Ar argument
 values are given, they are available as
-.Ql #1 ,
-.Ql #2
-or
 .Ql #{1} ,
 .Ql #{2}
 and so on.

tty.c

@@ -1004,7 +1004,7 @@ tty_window_offset1(struct tty *tty, u_int *ox, u_int *oy, u_int *sx, u_int *sy)
 		else if (cy > w->sy - *sy)
 			*oy = w->sy - *sy;
 		else
-			*oy = cy - *sy / 2;
+			*oy = cy - *sy + 1;
 	}
 
 	c->pan_window = NULL;