===================================================================
RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/tmux/tmux.1,v
retrieving revision 1.190
retrieving revision 1.191
diff -u -r1.190 -r1.191
--- src/usr.bin/tmux/tmux.1	2010/11/14 09:04:22	1.190
+++ src/usr.bin/tmux/tmux.1	2010/11/29 19:45:58	1.191
@@ -1,4 +1,4 @@
-.\" $OpenBSD: tmux.1,v 1.190 2010/11/14 09:04:22 nicm Exp $
+.\" $OpenBSD: tmux.1,v 1.191 2010/11/29 19:45:58 nicm 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: November 14 2010 $
+.Dd $Mdocdate: November 29 2010 $
 .Dt TMUX 1
 .Os
 .Sh NAME
@@ -1852,7 +1852,12 @@
 .Xc
 Use vi or emacs-style
 key bindings in the status line, for example at the command prompt.
-Defaults to emacs.
+The default is emacs, unless the
+.Ev VISUAL
+or
+.Ev EDITOR
+environment variables are set and contain the string
+.Ql vi .
 .It Ic status-left Ar string
 Display
 .Ar string
@@ -2140,7 +2145,14 @@
 .Op Ic vi | emacs
 .Xc
 Use vi or emacs-style key bindings in copy and choice modes.
-Key bindings default to emacs.
+As with the
+.Ic status-keys
+option, the default is emacs, unless
+.Ev VISUAL
+or
+.Ev EDITOR
+contains
+.Ql vi .
 .Pp
 .It Xo Ic mode-mouse
 .Op Ic on | off