The branch, master has been updated
via 1721056f351114cf03e4da284fdfc6b80f3aae38 (commit)
via 6eef24c37a69c0faa12deb4374730cf02561c934 (commit)
via d02c4bda3a4b456f654fb0c1b454ba9724bff0f3 (commit)
from 57332be8da86f0e40a91d7acd857564e789027a7 (commit)
- Log -----------------------------------------------------------------
commit 1721056f351114cf03e4da284fdfc6b80f3aae38
Author: Thomas Adam <[email protected]>
Commit: Thomas Adam <[email protected]>
Remove references to 88colour support
Tmux doesn't directly support terminals with 88 colours directly anymore.
---
tmux.1 | 2 +-
tmux.c | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/tmux.1 b/tmux.1
index cf1919c..cff5204 100644
--- a/tmux.1
+++ b/tmux.1
@@ -23,7 +23,7 @@
.Sh SYNOPSIS
.Nm tmux
.Bk -words
-.Op Fl 28lCquvV
+.Op Fl 2lCquvV
.Op Fl c Ar shell-command
.Op Fl f Ar file
.Op Fl L Ar socket-name
diff --git a/tmux.c b/tmux.c
index f5be1de..a804e6f 100644
--- a/tmux.c
+++ b/tmux.c
@@ -60,7 +60,7 @@ __dead void
usage(void)
{
fprintf(stderr,
- "usage: %s [-28lquvV] [-c shell-command] [-f file] [-L
socket-name]\n"
+ "usage: %s [-2lquvV] [-c shell-command] [-f file] [-L
socket-name]\n"
" [-S socket-path] [command [flags]]\n",
__progname);
exit(1);
commit 6eef24c37a69c0faa12deb4374730cf02561c934
Merge: d02c4bd 57332be
Author: Thomas <[email protected]>
Commit: Thomas <[email protected]>
Merge branch 'master' of ssh://git.code.sf.net/p/tmux/tmux-code
Makefile.am | 3 +-
TODO | 141 ++++++++++------------
cmd-kill-server.c | 14 ++-
cmd-server-info.c | 173 ---------------------------
cmd-set-option.c | 28 +++++
cmd-show-messages.c | 111 +++++++++++++++++-
cmd-start-server.c | 42 -------
configure.ac | 1 +
grid.c | 1 -
input.c | 57 +++++++++-
options-table.c | 231 ++++++++++++++++++++++++++++---------
options.c | 36 ++++++
screen-redraw.c | 145 +++++++++++------------
screen-write.c | 85 +-------------
server-client.c | 6 +-
session.c | 4 +-
status.c | 120 +++----------------
style.c | 224 +++++++++++++++++++++++++++++++++++
tmux.1 | 324 ++++++++++++++++++++++++++++----------------------
tmux.h | 40 +++++--
tty.c | 3 +-
window-choose.c | 4 +-
window-copy.c | 41 +++++--
window.c | 86 +++++++++++---
xterm-keys.c | 2 +-
25 files changed, 1122 insertions(+), 800 deletions(-)
commit d02c4bda3a4b456f654fb0c1b454ba9724bff0f3
Merge: ba014c1 938768e
Author: Thomas <[email protected]>
Commit: Thomas <[email protected]>
Merge branch 'obsd-master'
arguments.c | 18 +++++--------
client.c | 12 +++++++--
cmd-attach-session.c | 26 ++++++++++++++++++-
cmd-new-session.c | 17 ++++++++-----
cmd-new-window.c | 57 +++++++++++++++++++++++---------------------
cmd-queue.c | 4 ---
cmd-split-window.c | 17 ++++++++-----
cmd-switch-client.c | 43 +++++++++++++++++++++++++++------
cmd.c | 2 -
format.c | 7 +++++
grid.c | 4 +-
options.c | 2 +-
screen.c | 6 +----
tmux.1 | 3 ++
tmux.c | 21 +++++++++++----
tmux.h | 2 +
tty-acs.c | 64 +++++++++++++++++++++++++-------------------------
window-choose.c | 3 +-
window-copy.c | 4 +-
19 files changed, 191 insertions(+), 121 deletions(-)
diff --cc tmux.c
index 1e6edd9,d484839..f5be1de
--- a/tmux.c
+++ b/tmux.c
@@@ -367,15 -366,17 +372,19 @@@ main(int argc, char **argv
}
}
free(label);
- strlcpy(socket_path, path, sizeof socket_path);
+
+ if (strlcpy(socket_path, path, sizeof socket_path) >= sizeof
socket_path) {
+ fprintf(stderr, "socket path too long: %s\n", path);
+ exit(1);
+ }
free(path);
+#ifdef HAVE_SETPROCTITLE
/* Set process title. */
setproctitle("%s (%s)", __progname, socket_path);
+#endif
/* Pass control to the client. */
- ev_base = event_init();
+ ev_base = osdep_event_init();
exit(client_main(argc, argv, flags));
}
-----------------------------------------------------------------------
Summary of changes:
tmux.1 | 2 +-
tmux.c | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
hooks/post-receive
--
tmux
------------------------------------------------------------------------------
Managing the Performance of Cloud-Based Applications
Take advantage of what the Cloud has to offer - Avoid Common Pitfalls.
Read the Whitepaper.
http://pubads.g.doubleclick.net/gampad/clk?id=121051231&iu=/4140/ostg.clktrk
_______________________________________________
tmux-cvs mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/tmux-cvs
