The branch, master has been updated
via 2f7ffab0e8de524832b591a9ce6f034406f52e3d (commit)
via 3ed5e56a3974016dad9c28f42356aba9c05e0f4c (commit)
from a0802dd4869bfefe548734a840dc2e1d3cb15c90 (commit)
- Log -----------------------------------------------------------------
commit 2f7ffab0e8de524832b591a9ce6f034406f52e3d
Merge: 3ed5e56 a0802dd
Author: Nicholas Marriott <[email protected]>
Commit: Nicholas Marriott <[email protected]>
Merge branch 'master' of ssh://git.code.sf.net/p/tmux/tmux-code
TODO | 5 +++--
cmd-attach-session.c | 1 -
cmd-bind-key.c | 27 ++++++++++++---------------
cmd-break-pane.c | 1 -
cmd-capture-pane.c | 1 -
cmd-choose-buffer.c | 1 -
cmd-choose-client.c | 1 -
cmd-choose-list.c | 1 -
cmd-choose-tree.c | 3 ---
cmd-clear-history.c | 1 -
cmd-clock-mode.c | 1 -
cmd-command-prompt.c | 2 --
cmd-confirm-before.c | 1 -
cmd-copy-mode.c | 1 -
cmd-delete-buffer.c | 1 -
cmd-detach-client.c | 1 -
cmd-display-message.c | 7 +++----
cmd-display-panes.c | 1 -
cmd-find-window.c | 1 -
cmd-has-session.c | 1 -
cmd-if-shell.c | 1 -
cmd-join-pane.c | 2 --
cmd-kill-pane.c | 1 -
cmd-kill-server.c | 1 -
cmd-kill-session.c | 1 -
cmd-kill-window.c | 1 -
cmd-link-window.c | 1 -
cmd-list-buffers.c | 1 -
cmd-list-clients.c | 1 -
cmd-list-commands.c | 1 -
cmd-list-keys.c | 1 -
cmd-list-panes.c | 1 -
cmd-list-sessions.c | 1 -
cmd-list-windows.c | 1 -
cmd-load-buffer.c | 1 -
cmd-lock-server.c | 3 ---
cmd-move-window.c | 1 -
cmd-new-session.c | 15 +++++----------
cmd-new-window.c | 1 -
cmd-paste-buffer.c | 1 -
cmd-pipe-pane.c | 1 -
cmd-refresh-client.c | 1 -
cmd-rename-session.c | 1 -
cmd-rename-window.c | 1 -
cmd-resize-pane.c | 1 -
cmd-respawn-pane.c | 1 -
cmd-respawn-window.c | 1 -
cmd-rotate-window.c | 1 -
cmd-run-shell.c | 1 -
cmd-save-buffer.c | 2 --
cmd-select-layout.c | 3 ---
cmd-select-pane.c | 2 --
cmd-select-window.c | 4 ----
cmd-send-keys.c | 2 --
cmd-server-info.c | 1 -
cmd-set-buffer.c | 1 -
cmd-set-environment.c | 1 -
cmd-set-option.c | 2 --
cmd-show-environment.c | 1 -
cmd-show-messages.c | 1 -
cmd-show-options.c | 2 --
cmd-source-file.c | 1 -
cmd-split-window.c | 1 -
cmd-start-server.c | 1 -
cmd-suspend-client.c | 1 -
cmd-swap-pane.c | 1 -
cmd-swap-window.c | 1 -
cmd-switch-client.c | 1 -
cmd-unbind-key.c | 24 +++++++++++-------------
cmd-unlink-window.c | 1 -
cmd-wait-for.c | 1 -
cmd.c | 2 --
grid.c | 7 +++----
tmux.1 | 7 +++++--
tmux.h | 2 +-
window.c | 1 +
76 files changed, 44 insertions(+), 135 deletions(-)
commit 3ed5e56a3974016dad9c28f42356aba9c05e0f4c
Author: Nicholas Marriott <[email protected]>
Commit: Nicholas Marriott <[email protected]>
Set EVENT_NOEPOLL on Linux again.
---
osdep-linux.c | 11 ++---------
1 files changed, 2 insertions(+), 9 deletions(-)
diff --git a/osdep-linux.c b/osdep-linux.c
index b65acff..ccac267 100644
--- a/osdep-linux.c
+++ b/osdep-linux.c
@@ -84,14 +84,7 @@ osdep_get_cwd(int fd)
struct event_base *
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); */
+ /* On Linux, epoll doesn't work on /dev/null (yes, really). */
+ setenv("EVENT_NOEPOLL", "1", 1);
return (event_init());
}
-----------------------------------------------------------------------
Summary of changes:
osdep-linux.c | 11 ++---------
1 files changed, 2 insertions(+), 9 deletions(-)
hooks/post-receive
--
tmux
------------------------------------------------------------------------------
Introducing Performance Central, a new site from SourceForge and
AppDynamics. Performance Central is your source for news, insights,
analysis and resources for efficient Application Performance Management.
Visit us today!
http://pubads.g.doubleclick.net/gampad/clk?id=48897511&iu=/4140/ostg.clktrk
_______________________________________________
tmux-cvs mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/tmux-cvs
