Commit Graph

5719 Commits

Author SHA1 Message Date
9c601ebde8 Add pledge "stdio unix sendfd proc exec tty" to tmux client process,
"sendfd" is dropped after first message from the server.
2015-10-17 18:30:43 +00:00
0273d809d0 Merge branch 'master' of github.com:tmux/tmux 2015-10-17 18:48:45 +01:00
e0527d7731 time.h is not needed now tzset() is not in log.c. 2015-10-17 18:48:22 +01:00
a204595e4c Merge branch 'obsd-master' 2015-10-16 10:01:09 +01:00
cf89abb013 Don't free after calling paste_set but do after evbuffer_add, from Theo
Buehler.
2015-10-16 07:43:29 +00:00
c06c14fb29 Some header fixes. 2015-10-15 21:42:17 +01:00
716550021e Merge branch 'master' of github.com:tmux/tmux 2015-10-15 09:25:21 +01:00
f199fb6a2b Fix available_fds when there is no AF_INET, reported by Mathieu Arnold. 2015-10-15 09:24:25 +01:00
f69e09a67e Merge branch 'obsd-master' 2015-10-11 02:01:14 +01:00
241fd72f75 Userspace doesn't need to use SUN_LEN(): connect() and bind() must accept
sizeof(struct sockaddr_un), so do the simple, portable thing

ok beck@ deraadt@
2015-10-11 00:26:23 +00:00
5b13dafbab Merge branch 'obsd-master' 2015-10-07 12:01:21 +01:00
7340d5adfd Couple of memory leaks in error paths, from Frederik Vanderstraeten. 2015-10-07 09:52:58 +00:00
7120ab2f16 Merge branch 'obsd-master' 2015-09-26 02:01:16 +01:00
695a591f8e Adding colors=256 to *256color* was always pretty stupid and now it
won't work (without adding setaf@:setab@ too).
2015-09-25 23:30:24 +00:00
03d7dba5d8 If the terminal has colors=256, only try to use setaf/setab if they
exist, reported by Filipe Brandenburger.
2015-09-25 23:30:12 +00:00
20c3adca41 Merge branch 'obsd-master' 2015-09-25 18:01:09 +01:00
28f23f18e9 Free the history when it is cleared, based on a diff from Carlo Cannas. 2015-09-25 15:53:07 +00:00
b0372840e7 Merge branch 'obsd-master' 2015-09-24 14:01:10 +01:00
2a62917444 Don't leak fd and path on failure. 2015-09-24 12:06:20 +00:00
69ea6b9373 Do not leak log file descriptor. 2015-09-24 12:03:58 +00:00
ed17760a52 Merge branch 'obsd-master' 2015-09-24 10:01:09 +01:00
ddb2d1221b Assign flag not number for flag types (we got away with it so far
because that are a union). From Filipe Brandenburger.
2015-09-24 07:02:18 +00:00
06d4553a15 Merge branch 'master' of github.com:tmux/tmux 2015-09-23 14:27:11 +01:00
1caebaa49a Add to TODO. 2015-09-23 14:26:53 +01:00
7e9b87f396 Merge branch 'obsd-master' 2015-09-23 00:01:09 +01:00
dc66795e35 Don't update last session when the session is unchanged, from Sina Siadat. 2015-09-22 21:56:16 +00:00
d6d05883ad Merge branch 'obsd-master' 2015-09-21 12:01:11 +01:00
d5f223a3fe Reset the alerts timer always on activity, from Thomas Adam. 2015-09-21 09:34:52 +00:00
983357603a Merge branch 'obsd-master' 2015-09-18 12:01:07 +01:00
6b709e655e -l should apply to the new not the old pane with -b, from "MadMaverick9"
on GitHub.
2015-09-18 09:55:22 +00:00
c624382929 Merge branch 'obsd-master' 2015-09-17 16:01:08 +01:00
8b5d5dca9f Redraw both src and dst sessions in break-pane. 2015-09-17 14:11:55 +00:00
a3bce7a322 Merge branch 'obsd-master' 2015-09-17 00:01:08 +01:00
c1d0b6a6ee Log when cmdq_continue is called. 2015-09-16 22:41:00 +00:00
232a0ffc34 Give some variables less silly names. 2015-09-16 22:40:27 +00:00
ecb257f0ef A few minor style nits. 2015-09-16 22:40:05 +00:00
d1b73be6e1 Hoist some common code out of both branches of an if/else. 2015-09-16 22:29:30 +00:00
a4b4b29987 Rename cmd_q dead flag to a general flags bitmask (will be more flags later). 2015-09-16 22:24:54 +00:00
57ad1f6ddf Merge branch 'master' of github.com:tmux/tmux 2015-09-15 13:57:57 +01:00
54bd761286 Add BCE to TODO. 2015-09-15 13:57:46 +01:00
b5d789a531 Merge branch 'obsd-master' 2015-09-14 16:01:08 +01:00
166aa97f75 No more $Id$. 2015-09-14 15:59:21 +01:00
d47789620b Add missing <time.h> 2015-09-14 14:39:51 +01:00
16ee4de5df Remove some extra blank lines. 2015-09-14 13:22:02 +00:00
4afe26fa82 Merge branch 'obsd-master' 2015-09-14 14:01:09 +01:00
62bb6e37e0 Should add buffer if no -b. 2015-09-14 12:52:22 +00:00
216ddf3da5 Move tzset() from log_open to main. 2015-09-14 12:12:24 +00:00
8da6de3e66 Style nit, int for flags not u_int. 2015-09-14 11:57:22 +00:00
74b958ecbe Merge branch 'obsd-master'
Conflicts:
	Makefile
2015-09-14 12:42:19 +01:00
af16ce6ad9 When the active pane changes, redraw panes if the style has
changed. From Cam Hutchison.
2015-09-14 11:34:50 +00:00