The branch, master has been updated
via 201036ad80f2e51f7238db2adf05914a4a4f5819 (commit)
via 65257b8e9b55d8d180265d714ba9b3637643c6dc (commit)
from 696b5a628f0f31f4c3566b5c0ab51fbd9f9f9880 (commit)
- Log -----------------------------------------------------------------
commit 201036ad80f2e51f7238db2adf05914a4a4f5819
Merge: 65257b8 696b5a6
Author: Nicholas Marriott <nicholas.marri...@gmail.com>
Commit: Nicholas Marriott <nicholas.marri...@gmail.com>
Merge branch 'master' of ssh://git.code.sf.net/p/tmux/tmux-code
Makefile.am | 3 -
arguments.c | 1 +
array.h | 4 +-
client.c | 13 ++--
cmd-attach-session.c | 1 -
cmd-bind-key.c | 1 -
cmd-break-pane.c | 3 +-
cmd-capture-pane.c | 3 +-
cmd-choose-buffer.c | 4 +-
cmd-choose-client.c | 7 ++-
cmd-choose-tree.c | 12 +++-
cmd-clear-history.c | 1 -
cmd-clock-mode.c | 1 -
cmd-command-prompt.c | 30 --------
cmd-confirm-before.c | 22 +-----
cmd-copy-mode.c | 10 ---
cmd-delete-buffer.c | 1 -
cmd-detach-client.c | 18 +++++-
cmd-display-message.c | 6 ++-
cmd-display-panes.c | 1 -
cmd-find-window.c | 6 ++-
cmd-has-session.c | 1 -
cmd-if-shell.c | 1 -
cmd-join-pane.c | 17 -----
cmd-kill-pane.c | 1 -
cmd-kill-server.c | 2 -
cmd-kill-session.c | 1 -
cmd-kill-window.c | 1 -
cmd-link-window.c | 1 -
cmd-list-buffers.c | 4 +-
cmd-list-clients.c | 6 ++-
cmd-list-commands.c | 54 --------------
cmd-list-keys.c | 33 +++++++++-
cmd-list-panes.c | 1 -
cmd-list-sessions.c | 9 ++-
cmd-list-windows.c | 17 ++++-
cmd-load-buffer.c | 1 -
cmd-lock-server.c | 3 -
cmd-move-window.c | 1 -
cmd-new-session.c | 17 ++++-
cmd-new-window.c | 3 +-
cmd-paste-buffer.c | 1 -
cmd-pipe-pane.c | 1 -
cmd-queue.c | 4 +-
cmd-refresh-client.c | 1 -
cmd-rename-session.c | 1 -
cmd-rename-window.c | 1 -
cmd-resize-pane.c | 48 -------------
cmd-respawn-pane.c | 1 -
cmd-respawn-window.c | 1 -
cmd-rotate-window.c | 10 ---
cmd-run-shell.c | 1 -
cmd-save-buffer.c | 4 +-
cmd-select-layout.c | 29 --------
cmd-select-pane.c | 19 -----
cmd-select-window.c | 19 -----
cmd-send-keys.c | 2 -
cmd-set-buffer.c | 3 +-
cmd-set-environment.c | 1 -
cmd-set-option.c | 2 -
cmd-show-environment.c | 1 -
cmd-show-messages.c | 2 -
cmd-show-options.c | 2 -
cmd-source-file.c | 1 -
cmd-split-window.c | 12 +---
cmd-string.c | 19 +++---
cmd-suspend-client.c | 55 ---------------
cmd-swap-pane.c | 12 ---
cmd-swap-window.c | 1 -
cmd-switch-client.c | 19 -----
cmd-unbind-key.c | 1 -
cmd-unlink-window.c | 1 -
cmd-wait-for.c | 1 -
cmd.c | 99 +++++++++++++++------------
control.c | 2 +-
format.c | 9 ++-
grid.c | 15 +++--
input.c | 4 +-
job.c | 1 +
key-bindings.c | 180 +++++++++++++++++++++++-------------------------
log.c | 6 +-
options.c | 2 +-
osdep-cygwin.c | 2 +-
osdep-linux.c | 3 +-
paste.c | 2 +-
screen-write.c | 28 ++++----
screen.c | 10 ++--
server-client.c | 1 +
server-fn.c | 2 +-
signal.c | 2 +
status.c | 15 +++--
style.c | 2 +
tmux.1 | 17 ++---
tmux.c | 7 +-
tmux.h | 126 +++++++---------------------------
tty-acs.c | 2 +-
utf8.c | 8 +-
window-choose.c | 2 +-
window-copy.c | 18 ++++--
xmalloc.c | 26 +++++--
100 files changed, 432 insertions(+), 757 deletions(-)
commit 65257b8e9b55d8d180265d714ba9b3637643c6dc
Author: Nicholas Marriott <nicholas.marri...@gmail.com>
Commit: Nicholas Marriott <nicholas.marri...@gmail.com>
OS X lacks HOST_NAME_MAX, reported by Christian Ebert.
---
compat.h | 4 ++++
1 files changed, 4 insertions(+), 0 deletions(-)
diff --git a/compat.h b/compat.h
index 2e433a0..5f3ff8f 100644
--- a/compat.h
+++ b/compat.h
@@ -176,6 +176,10 @@ typedef uint64_t u_int64_t;
#define TTY_NAME_MAX 32
#endif
+#ifndef HOST_NAME_MAX
+#define HOST_NAME_MAX 255
+#endif
+
#ifndef HAVE_FLOCK
#define LOCK_SH 0
#define LOCK_EX 0
-----------------------------------------------------------------------
Summary of changes:
compat.h | 4 ++++
1 files changed, 4 insertions(+), 0 deletions(-)
hooks/post-receive
--
tmux
------------------------------------------------------------------------------
Comprehensive Server Monitoring with Site24x7.
Monitor 10 servers for $9/Month.
Get alerted through email, SMS, voice calls or mobile push notifications.
Take corrective actions from your mobile device.
http://p.sf.net/sfu/Zoho
_______________________________________________
tmux-cvs mailing list
tmux-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/tmux-cvs
