Merge branch 'obsd-master'

Conflicts:
	Makefile
	cmd-list-commands.c
	cmd-suspend-client.c
	job.c
	tmux.h
	xmalloc.c

tmux.1

@@ -439,10 +439,11 @@ first attempts to use the argument as a pane index; if that fails, it is looked
 up as for
 .Ar target-window .
 A
-.Ql +
-or
+.Ql + ,
 .Ql -
-indicate the next or previous pane index, respectively.
+or
+.Ql \&!
+indicate the next, previous or last pane.
 One of the strings
 .Em top ,
 .Em bottom ,
@@ -1859,7 +1860,7 @@ In addition, the following special key names are accepted:
 .Em Escape ,
 .Em F1
 to
-.Em F20 ,
+.Em F12 ,
 .Em Home ,
 .Em IC
 (Insert),
@@ -3652,7 +3653,7 @@ to change the cursor colour from inside
 $ printf '\e033]12;red\e033\e\e'
 .Ed
 .It Em \&Ss , Se
-Change the cursor style.
+Set or reset the cursor style.
 If set, a sequence such as this may be used
 to change the cursor to an underline:
 .Bd -literal -offset indent
@@ -3660,10 +3661,8 @@ $ printf '\e033[4 q'
 .Ed
 .Pp
 If
-.Em Csr
-is set, it will be used to reset the cursor style instead
-of
-.Em Cs .
+.Em Se
+is not set, \&Ss with argument 0 will be used to reset the cursor style instead.
 .It Em \&Ms
 This sequence can be used by
 .Nm