Nicholas Marriott
92f187d1c2
Need to use pkg-config --static when doing a static build.
2015-12-12 22:04:25 +00:00
Thomas Adam
845a664bb2
Merge branch 'obsd-master'
2015-12-12 20:01:15 +00:00
nicm
5ed17e84fa
Add key-table option to set the default key table for a session, allows
...
different key bindings for different sessions and a few other things.
2015-12-12 18:32:24 +00:00
nicm
6a50cf89b4
Return after changing key table.
2015-12-12 18:28:47 +00:00
nicm
39cf9c9d31
Allow prefix and prefix2 to be set to None to disable (useful if you
...
would rather bind the prefix in the root table).
2015-12-12 18:19:00 +00:00
Nicholas Marriott
5a5db02b85
Merge branch 'master' of github.com:tmux/tmux
2015-12-11 19:59:08 +00:00
Nicholas Marriott
38cc1a1843
Look for ncurses with PKG_CONFIG, and remove libtinfo because it just causes
...
confusion.
2015-12-11 19:58:41 +00:00
Thomas Adam
2a6b215328
Merge branch 'obsd-master'
2015-12-11 18:01:11 +00:00
nicm
88bc8f3528
Style nits and line wrapping of function declarations.
2015-12-11 16:37:21 +00:00
nicm
f2be3ad46f
Mention {src,dst}-{window,pane} where we define target-{window,pane}.
2015-12-11 16:27:01 +00:00
Thomas Adam
2a3456cd3b
Merge branch 'obsd-master'
2015-12-11 16:01:16 +00:00
nicm
bd5918760e
We cannot do hooks_find and then hooks_remove because it might have come
...
from the parent (global) tree, instead make it remove by name like options.
While here, also tidy up a few bits of options and hooks handling (use
RB_FOREACH_SAFE, and a helper function for the free).
2015-12-11 15:46:57 +00:00
Thomas Adam
4909a70174
Merge branch 'obsd-master'
2015-12-11 13:24:45 +00:00
nicm
d7e11d0af7
Check alerts when session changes, from Patrick Palka.
2015-12-11 12:39:47 +00:00
nicm
01831da5f5
Add cmdq as an argument to format_create and add a format for the
...
command name (will also be used for more later).
2015-12-11 12:27:36 +00:00
Thomas Adam
af8134a6ff
Merge branch 'obsd-master'
2015-12-08 10:01:16 +00:00
Nicholas Marriott
a988c36ccb
Add to .mailmap, and sort.
2015-12-08 08:46:06 +00:00
nicm
e0f26dcda3
Remove format_create_flags and just pass flags to format_create.
2015-12-08 08:34:18 +00:00
nicm
8f671d3eef
Spacing nits.
2015-12-08 08:14:04 +00:00
Thomas Adam
3182728b70
Merge branch 'obsd-master'
2015-12-08 07:12:13 +00:00
Thomas Adam
5862f59ed7
Conflicts:
...
Makefile
2015-12-08 07:11:09 +00:00
jmc
1f94274b92
Ed was meant to be El;
2015-12-08 06:42:07 +00:00
nicm
d2fb0efcd1
Add hooks infrastructure, basic commands (set-hook, show-hooks) and a
...
couple of not very useful client hooks. This will eventually let
commands be run at various points and on notifications. Joint work with
Thomas Adam.
2015-12-08 01:10:31 +00:00
mmcc
dbfce2a4d8
Use ^= instead of a verbose alternative. ok nicm@
2015-12-08 00:51:17 +00:00
Nicholas Marriott
98994a8bb1
termios(4)
2015-12-08 00:49:10 +00:00
Nicholas Marriott
b580a55191
pty(7) -> pty(4)
2015-12-08 00:48:22 +00:00
Nicholas Marriott
ff16836d1d
pty is in section 4
2015-12-08 00:47:27 +00:00
Nicholas Marriott
5411033f66
Update tmux.vim from Teubel Gyorgy.
2015-12-07 12:54:34 +00:00
Nicholas Marriott
8383409e88
Merge branch 'master' of github.com:tmux/tmux
2015-12-07 12:51:20 +00:00
Nicholas Marriott
d20a3ef57c
Update .mailmap file.
2015-12-07 12:51:06 +00:00
Thomas Adam
bac8c72381
Merge branch 'obsd-master'
2015-12-07 10:01:09 +00:00
nicm
b9563340b7
Fix bell indicators across detach, reported by Torbjorn Lonnemark, diff
...
from Thomas Adam.
2015-12-07 09:47:41 +00:00
Thomas Adam
8ae9329aa8
Merge branch 'obsd-master'
2015-12-05 14:01:09 +00:00
claudio
0417f1f2be
EAGAIN handling for imsg_read. OK henning@ benno@
2015-12-05 13:18:24 +00:00
Nicholas Marriott
4d5cab4085
Merge branch 'master' of github.com:tmux/tmux
2015-12-03 14:43:33 +00:00
Nicholas Marriott
3cdb2f0bb7
Add to TODO.
2015-12-03 14:43:24 +00:00
Thomas Adam
66bad2e979
Merge branch 'obsd-master'
2015-12-03 00:01:08 +00:00
nicm
7236838dea
Mark new active pane changed after pane lost in window, and after
...
break-pane. Reported by tim@.
2015-12-02 23:09:22 +00:00
Thomas Adam
eb5ee80c74
Merge branch 'obsd-master'
2015-12-01 10:01:13 +00:00
nicm
a785a7f700
Do not deref wp if window_get_active_at returns NULL which can happen on
...
very large terminals, from Michael Graczyk.
2015-12-01 09:41:03 +00:00
Thomas Adam
742976893e
Merge branch 'obsd-master'
2015-11-29 18:01:08 +00:00
guenther
1d331c7e62
Delete a duplicated line
...
ok jmc@
2015-11-29 17:06:59 +00:00
Thomas Adam
9fe8b28746
Merge branch 'obsd-master'
2015-11-27 15:41:28 +00:00
nicm
6a2ca34216
Do not set a limit on the length of commands when printing them.
2015-11-27 15:06:43 +00:00
Nicholas Marriott
3b83bda29c
Add to TODO.
2015-11-25 23:35:24 +00:00
Thomas Adam
a1bc339340
log_open() isn't conditional on proctitle
2015-11-25 16:51:17 +00:00
Thomas Adam
260de2cb5e
Remove logfile()
2015-11-25 16:48:47 +00:00
Thomas Adam
890d8da2e3
Merge branch 'obsd-master'
...
Conflicts:
log.c
proc.c
tmux.c
2015-11-25 16:37:30 +00:00
nicm
ac8678aefe
Don't print error if none to print.
2015-11-25 07:58:55 +00:00
nicm
62d3af17f9
Make environ_set va_args and use it to tidy up some calls. Also add a
...
missing word in manpage (from jmc).
2015-11-24 23:46:15 +00:00