From 293127760860c55733efa5b25ed8a95734cbf529 Mon Sep 17 00:00:00 2001
From: Tiago Cunha <tcunha@gmx.com>
Date: Mon, 5 Oct 2009 18:21:58 +0000
Subject: [PATCH] Sync OpenBSD patchset 356:

Add a key string for space ("Space") and document the names, suggested by
guenther@. Also document how to bind " and ', suggested by miod@.
---
 key-string.c |  3 ++-
 tmux.1       | 56 ++++++++++++++++++++++++++++++++++++++++++----------
 2 files changed, 48 insertions(+), 11 deletions(-)

diff --git a/key-string.c b/key-string.c
index 89ac1dbc..714cf6e9 100644
--- a/key-string.c
+++ b/key-string.c
@@ -1,4 +1,4 @@
-/* $Id: key-string.c,v 1.22 2009-07-28 23:13:00 tcunha Exp $ */
+/* $Id: key-string.c,v 1.23 2009-10-05 18:21:58 tcunha Exp $ */
 
 /*
  * Copyright (c) 2007 Nicholas Marriott <nicm@users.sourceforge.net>
@@ -57,6 +57,7 @@ struct {
 	{ "PPage",	KEYC_PPAGE },
 	{ "Tab",	'\011' },
 	{ "BTab",	KEYC_BTAB },
+	{ "Space",	' ' },
 	{ "BSpace",	KEYC_BSPACE },
 	{ "Enter",	'\r' },
 	{ "Escape",	'\033' },
diff --git a/tmux.1 b/tmux.1
index 254091ac..400bcf70 100644
--- a/tmux.1
+++ b/tmux.1
@@ -1,4 +1,4 @@
-.\" $Id: tmux.1,v 1.174 2009-09-25 17:51:39 tcunha Exp $
+.\" $Id: tmux.1,v 1.175 2009-10-05 18:21:58 tcunha Exp $
 .\"
 .\" Copyright (c) 2007 Nicholas Marriott <nicm@users.sourceforge.net>
 .\"
@@ -14,7 +14,7 @@
 .\" IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING
 .\" OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 .\"
-.Dd $Mdocdate: September 24 2009 $
+.Dd $Mdocdate: October 4 2009 $
 .Dt TMUX 1
 .Os
 .Sh NAME
@@ -978,6 +978,50 @@ destroyed.
 Move up a pane.
 .El
 .Sh KEY BINDINGS
+.Nm
+allows a command to be bound to most keys, with or without a prefix key.
+When specifying keys, most represent themselves (for example
+.Ql A
+to
+.Ql Z
+).
+Ctrl keys may be prefixed with
+.Ql C-
+or
+.Ql ^
+, and Alt (meta) with
+.Ql M- .
+In addition, the following special key names are accepted:
+.Em BSpace ,
+.Em BTab ,
+.Em DC
+(Delete),
+.Em End ,
+.Em Enter ,
+.Em Escape ,
+.Em F1
+to
+.Em F20 ,
+.Em Home ,
+.Em IC
+(Insert),
+.Em NPage
+(Page Up),
+.Em PPage
+(Page Down),
+.Em Space ,
+and
+.Em Tab .
+Note that to bind the
+.Ql \&"
+or
+.Ql '
+keys, quotation marks are necessary, for example:
+.Bd -literal -offset indent
+bind-key '"' split-window
+bind-key "'" select-prompt
+.Ed
+.Pp
 Commands related to key bindings are as follows:
 .Bl -tag -width Ds
 .It Xo Ic bind-key
@@ -990,14 +1034,6 @@ Bind key
 .Ar key
 to
 .Ar command .
-Keys may be specified prefixed with
-.Ql C-
-or
-.Ql ^
-for Ctrl keys, or
-.Ql M-
-for Alt (meta) keys.
-.Pp
 By default (without
 .Fl t )
 the primary key bindings are modified (those normally activated with the prefix