5682 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
nicm	60ca29df64	client_key_table was missing.	2015-10-21 13:14:36 +00:00
Thomas Adam	35f582583a	Merge branch 'obsd-master'	2015-10-21 14:01:09 +01:00
nicm	ddbc4a0f6c	By popular demand add a default binding for mouse wheel up to scroll ... into history (if the mouse is, on of course).	2015-10-21 11:13:47 +00:00
Thomas Adam	1f4a5b5dfe	Merge branch 'obsd-master'	2015-10-21 00:01:19 +01:00
nicm	076034345a	Use client pointer not file descriptor in logging.	2015-10-20 21:12:08 +00:00
Thomas Adam	af2d48f4d2	Merge branch 'obsd-master'	2015-10-20 16:01:11 +01:00
nicm	8c8cddbe02	The table could change when retrying so don't save it at start of ... server_client_handle_key.	2015-10-20 14:19:27 +00:00
Thomas Adam	bbdc08780c	Merge branch 'obsd-master'	2015-10-18 22:01:08 +01:00
nicm	174a2ad731	Pass current directory as a string rather than a file descriptor because ... pledge doesn't let us pass directory file descriptors.	2015-10-18 20:42:42 +00:00
Thomas Adam	7c78b2b756	Start working on tmux 2.2	2015-10-18 18:19:08 +01:00
Thomas Adam	310f0a960c	Update for 2.1 release.	2015-10-18 18:10:43 +01:00
Nicholas Marriott	6c3ade76df	__OpenBSD__ around pledge().	2015-10-17 20:16:12 +01:00
Thomas Adam	487285b325	Merge branch 'obsd-master'	2015-10-17 20:01:08 +01:00
nicm	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
Nicholas Marriott	0273d809d0	Merge branch 'master' of github.com:tmux/tmux	2015-10-17 18:48:45 +01:00
Nicholas Marriott	e0527d7731	time.h is not needed now tzset() is not in log.c.	2015-10-17 18:48:22 +01:00
Thomas Adam	a204595e4c	Merge branch 'obsd-master'	2015-10-16 10:01:09 +01:00
nicm	cf89abb013	Don't free after calling paste_set but do after evbuffer_add, from Theo ... Buehler.	2015-10-16 07:43:29 +00:00
Nicholas Marriott	c06c14fb29	Some header fixes.	2015-10-15 21:42:17 +01:00
Nicholas Marriott	716550021e	Merge branch 'master' of github.com:tmux/tmux	2015-10-15 09:25:21 +01:00
Nicholas Marriott	f199fb6a2b	Fix available_fds when there is no AF_INET, reported by Mathieu Arnold.	2015-10-15 09:24:25 +01:00
Thomas Adam	f69e09a67e	Merge branch 'obsd-master'	2015-10-11 02:01:14 +01:00
guenther	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
Thomas Adam	5b13dafbab	Merge branch 'obsd-master'	2015-10-07 12:01:21 +01:00
nicm	7340d5adfd	Couple of memory leaks in error paths, from Frederik Vanderstraeten.	2015-10-07 09:52:58 +00:00
Thomas Adam	7120ab2f16	Merge branch 'obsd-master'	2015-09-26 02:01:16 +01:00
nicm	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
nicm	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
Thomas Adam	20c3adca41	Merge branch 'obsd-master'	2015-09-25 18:01:09 +01:00
nicm	28f23f18e9	Free the history when it is cleared, based on a diff from Carlo Cannas.	2015-09-25 15:53:07 +00:00
Thomas Adam	b0372840e7	Merge branch 'obsd-master'	2015-09-24 14:01:10 +01:00
nicm	2a62917444	Don't leak fd and path on failure.	2015-09-24 12:06:20 +00:00
nicm	69ea6b9373	Do not leak log file descriptor.	2015-09-24 12:03:58 +00:00
Thomas Adam	ed17760a52	Merge branch 'obsd-master'	2015-09-24 10:01:09 +01:00
nicm	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
Nicholas Marriott	06d4553a15	Merge branch 'master' of github.com:tmux/tmux	2015-09-23 14:27:11 +01:00
Nicholas Marriott	1caebaa49a	Add to TODO.	2015-09-23 14:26:53 +01:00
Thomas Adam	7e9b87f396	Merge branch 'obsd-master'	2015-09-23 00:01:09 +01:00
nicm	dc66795e35	Don't update last session when the session is unchanged, from Sina Siadat.	2015-09-22 21:56:16 +00:00
Thomas Adam	d6d05883ad	Merge branch 'obsd-master'	2015-09-21 12:01:11 +01:00
nicm	d5f223a3fe	Reset the alerts timer always on activity, from Thomas Adam.	2015-09-21 09:34:52 +00:00
Thomas Adam	983357603a	Merge branch 'obsd-master'	2015-09-18 12:01:07 +01:00
nicm	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
Thomas Adam	c624382929	Merge branch 'obsd-master'	2015-09-17 16:01:08 +01:00
nicm	8b5d5dca9f	Redraw both src and dst sessions in break-pane.	2015-09-17 14:11:55 +00:00
Thomas Adam	a3bce7a322	Merge branch 'obsd-master'	2015-09-17 00:01:08 +01:00
nicm	c1d0b6a6ee	Log when cmdq_continue is called.	2015-09-16 22:41:00 +00:00
nicm	232a0ffc34	Give some variables less silly names.	2015-09-16 22:40:27 +00:00
nicm	ecb257f0ef	A few minor style nits.	2015-09-16 22:40:05 +00:00
nicm	d1b73be6e1	Hoist some common code out of both branches of an if/else.	2015-09-16 22:29:30 +00:00