Commit Graph

5844 Commits

Author SHA1 Message Date
2a3456cd3b Merge branch 'obsd-master' 2015-12-11 16:01:16 +00:00
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
4909a70174 Merge branch 'obsd-master' 2015-12-11 13:24:45 +00:00
d7e11d0af7 Check alerts when session changes, from Patrick Palka. 2015-12-11 12:39:47 +00:00
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
af8134a6ff Merge branch 'obsd-master' 2015-12-08 10:01:16 +00:00
a988c36ccb Add to .mailmap, and sort. 2015-12-08 08:46:06 +00:00
e0f26dcda3 Remove format_create_flags and just pass flags to format_create. 2015-12-08 08:34:18 +00:00
8f671d3eef Spacing nits. 2015-12-08 08:14:04 +00:00
3182728b70 Merge branch 'obsd-master' 2015-12-08 07:12:13 +00:00
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
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
dbfce2a4d8 Use ^= instead of a verbose alternative. ok nicm@ 2015-12-08 00:51:17 +00:00
98994a8bb1 termios(4) 2015-12-08 00:49:10 +00:00
b580a55191 pty(7) -> pty(4) 2015-12-08 00:48:22 +00:00
ff16836d1d pty is in section 4 2015-12-08 00:47:27 +00:00
5411033f66 Update tmux.vim from Teubel Gyorgy. 2015-12-07 12:54:34 +00:00
8383409e88 Merge branch 'master' of github.com:tmux/tmux 2015-12-07 12:51:20 +00:00
d20a3ef57c Update .mailmap file. 2015-12-07 12:51:06 +00:00
bac8c72381 Merge branch 'obsd-master' 2015-12-07 10:01:09 +00:00
b9563340b7 Fix bell indicators across detach, reported by Torbjorn Lonnemark, diff
from Thomas Adam.
2015-12-07 09:47:41 +00:00
8ae9329aa8 Merge branch 'obsd-master' 2015-12-05 14:01:09 +00:00
0417f1f2be EAGAIN handling for imsg_read. OK henning@ benno@ 2015-12-05 13:18:24 +00:00
4d5cab4085 Merge branch 'master' of github.com:tmux/tmux 2015-12-03 14:43:33 +00:00
3cdb2f0bb7 Add to TODO. 2015-12-03 14:43:24 +00:00
66bad2e979 Merge branch 'obsd-master' 2015-12-03 00:01:08 +00:00
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
eb5ee80c74 Merge branch 'obsd-master' 2015-12-01 10:01:13 +00:00
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
742976893e Merge branch 'obsd-master' 2015-11-29 18:01:08 +00:00
1d331c7e62 Delete a duplicated line
ok jmc@
2015-11-29 17:06:59 +00:00
9fe8b28746 Merge branch 'obsd-master' 2015-11-27 15:41:28 +00:00
6a2ca34216 Do not set a limit on the length of commands when printing them. 2015-11-27 15:06:43 +00:00
3b83bda29c Add to TODO. 2015-11-25 23:35:24 +00:00
a1bc339340 log_open() isn't conditional on proctitle 2015-11-25 16:51:17 +00:00
260de2cb5e Remove logfile() 2015-11-25 16:48:47 +00:00
890d8da2e3 Merge branch 'obsd-master'
Conflicts:
	log.c
	proc.c
	tmux.c
2015-11-25 16:37:30 +00:00
ac8678aefe Don't print error if none to print. 2015-11-25 07:58:55 +00:00
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
3ff46b2e43 Shell command from -c doesn't have to be global, pass it as an argument. 2015-11-24 23:22:51 +00:00
dca93c56e0 Do lock failures slightly better, return a special value so we don't
unlink the wrong thing.
2015-11-24 23:01:51 +00:00
73e30cbda8 Actually show something (even if it not that helpful) if the server
fails to start (for example if it can't create the socket), rather than
hanging or showing nothing.
2015-11-24 22:45:44 +00:00
c18fbefe93 Document socket_path format. 2015-11-24 22:27:59 +00:00
c913fb99b6 Tidy the code that works out the socket path, and just use the full path
in the global socket_path rather than copying it.
2015-11-24 22:27:22 +00:00
8976dac9e0 Remove malloc_options DEBUG bit. 2015-11-24 22:09:53 +00:00
bef217b241 Switch a fprintf to a fatal, and wrap some long lines. 2015-11-24 22:04:36 +00:00
1e2df2d464 Remove the -I part of show-messages which isn't really that useful; the
server start time can now be accessed with a new start_time format (use:
tmux display -p '#{t:start_time}')
2015-11-24 21:52:06 +00:00
9fd3318dd8 All kill-session -C to clear alerts in all windows, suggested by Aaron
U'Ren.
2015-11-24 21:50:06 +00:00
4e3015a892 Log some system and libevent information at startup. 2015-11-24 21:32:36 +00:00