aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--osdep-linux.c9
-rw-r--r--tmux.19
2 files changed, 13 insertions, 5 deletions
diff --git a/osdep-linux.c b/osdep-linux.c
index e3fe277d..143c5678 100644
--- a/osdep-linux.c
+++ b/osdep-linux.c
@@ -1,4 +1,4 @@
-/* $Id: osdep-linux.c,v 1.7 2010-12-30 20:41:08 nicm Exp $ */
+/* $Id: osdep-linux.c,v 1.8 2011-01-13 19:58:47 nicm Exp $ */
/*
* Copyright (c) 2009 Nicholas Marriott <nicm@users.sourceforge.net>
@@ -65,7 +65,12 @@ osdep_event_init(void)
{
/*
* On Linux, epoll doesn't work on /dev/null (yes, really).
+ *
+ * This has been commented because libevent versions up until the very
+ * latest (1.4 git or 2.0.10) do not handle signals properly when using
+ * poll or select, causing hangs.
+ *
*/
- setenv("EVENT_NOEPOLL", "1", 1);
+ /* setenv("EVENT_NOEPOLL", "1", 1); */
return (event_init());
}
diff --git a/tmux.1 b/tmux.1
index ed5a75b1..ef8efcfd 100644
--- a/tmux.1
+++ b/tmux.1
@@ -1,4 +1,4 @@
-.\" $Id: tmux.1,v 1.287 2011-01-07 15:02:38 tcunha Exp $
+.\" $Id: tmux.1,v 1.288 2011-01-13 19:58:47 nicm Exp $
.\"
.\" Copyright (c) 2007 Nicholas Marriott <nicm@users.sourceforge.net>
.\"
@@ -2144,8 +2144,11 @@ may use the terminal alternate screen feature, which allows the
and
.Em rmcup
.Xr terminfo 5
-capabilities to be issued to preserve the existing window content on start and
-restore it on exit.
+capabilities.
+The alternate screen feature preserves the contents of the window when an
+interactive application starts and restores it on exit, so that any output
+visible before the application starts reappears unchanged after it exits.
+The default is on.
.Pp
.It Xo Ic automatic-rename
.Op Ic on | off