summaryrefslogtreecommitdiff
path: root/usr.bin/tmux/screen.c
diff options
context:
space:
mode:
authorNicholas Marriott <nicm@cvs.openbsd.org>2010-04-06 21:35:45 +0000
committerNicholas Marriott <nicm@cvs.openbsd.org>2010-04-06 21:35:45 +0000
commit916ca4a507e705a47aa3dba40687b0ed2087d1b3 (patch)
treeeb5c409793e3606f49eb6737286a9af92384ec90 /usr.bin/tmux/screen.c
parentd8564c66217ccb969e92abb42eb7867098deda69 (diff)
Merge copy mode and output mode, dropping the latter. Idea and code from
Micah Cowan.
Diffstat (limited to 'usr.bin/tmux/screen.c')
-rw-r--r--usr.bin/tmux/screen.c5
1 files changed, 3 insertions, 2 deletions
diff --git a/usr.bin/tmux/screen.c b/usr.bin/tmux/screen.c
index e768bbc37d7..efcca0d0cc5 100644
--- a/usr.bin/tmux/screen.c
+++ b/usr.bin/tmux/screen.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: screen.c,v 1.15 2010/04/04 23:05:15 beck Exp $ */
+/* $OpenBSD: screen.c,v 1.16 2010/04/06 21:35:44 nicm Exp $ */
/*
* Copyright (c) 2007 Nicholas Marriott <nicm@users.sourceforge.net>
@@ -20,6 +20,7 @@
#include <stdlib.h>
#include <string.h>
+#include <unistd.h>
#include <vis.h>
#include "tmux.h"
@@ -55,7 +56,7 @@ screen_reinit(struct screen *s)
s->rupper = 0;
s->rlower = screen_size_y(s) - 1;
- s->mode = MODE_CURSOR;
+ s->mode = MODE_CURSOR | MODE_WRAP;
screen_reset_tabs(s);