6812 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
Thomas Adam	ff526e43de	Merge branch 'obsd-master'	2017-09-22 12:01:13 +01:00
nicm	d563aa7c7b	Initialize alerts timer event where it is used, avoids crash with new windows.	2017-09-22 09:04:46 +00:00
Thomas Adam	ae5a62a514	Merge branch 'obsd-master'	2017-09-13 10:01:10 +01:00
nicm	c86d83f835	Remove unused (always 1) arguments from some functions, from Daniel ... Mueller in GitHub issue 1073.	2017-09-13 07:31:07 +00:00
Thomas Adam	9a1b9f15a1	Merge branch 'obsd-master'	2017-09-11 22:01:10 +01:00
nicm	af2c7ce646	Check event is initialized before delete; fixes crash reported by ... Michael Nickerson in GitHub issue 1068.	2017-09-11 20:11:45 +00:00
Nicholas Marriott	b541a97821	2.6-rc3.	2017-09-11 10:12:25 +01:00
Nicholas Marriott	495e2ed17f	Merge branch 'master' into 2.6-rc	2017-09-11 10:08:15 +01:00
Thomas Adam	d8c397d1b7	Merge branch 'obsd-master'	2017-09-11 10:01:11 +01:00
nicm	d8d6c2746e	Mention that filter is a format.	2017-09-11 06:53:06 +00:00
nicm	6fdaaa0637	Do not free more lines than are available in the history.	2017-09-11 06:40:46 +00:00
Nicholas Marriott	034b19b734	2.6-rc2.	2017-09-10 16:08:22 +01:00
Nicholas Marriott	cb8eba1530	Merge branch 'master' into 2.6-rc	2017-09-10 16:07:44 +01:00
Thomas Adam	7aa8b8a25c	Merge branch 'obsd-master'	2017-09-10 16:01:14 +01:00
Nicholas Marriott	abcbfcb0e8	Merge branch 'master' into 2.6-rc	2017-09-10 15:38:02 +01:00
nicm	70bc07a358	Previously, extended cell data was never reduced in size even when the ... cell was overwritten. With a large history this can be a substantial amount of memory. To reduce this, compact each extended cell list to only cells in use as it is scrolled off the visible screen into the history. From Dan Aloni in GitHub issue 1062.	2017-09-10 14:36:12 +00:00
Thomas Adam	7f83b53027	Merge branch 'obsd-master' ... Conflicts: server-client.c	2017-09-10 11:39:45 +01:00
nicm	8405fcdd9b	Apply timeout to CAN and RS which also wait for ST.	2017-09-10 08:01:23 +00:00
nicm	f56f09ea38	Fix a few errors in how the selected line is chosen after resize, ... reported by Felix Rosencrantz in GitHub issue 1059.	2017-09-08 16:28:41 +00:00
Nicholas Marriott	c62cfe64c8	Add to CHANGES.	2017-09-08 14:22:34 +01:00
nicm	78cf3c14ca	When removing a key table clear it out of clients, fixes issue with ... unbind -a reported by Thomas Sattler.	2017-09-08 08:45:27 +00:00
nicm	89e057dc4a	Do not fail if unset an option that is already unset, reported by Thomas ... Sattler.	2017-09-07 13:18:44 +00:00
nicm	466066c3a1	Do not attempt to use TIOCSWINSZ on a -1 file descriptor (possible if ... the pane has already died).	2017-09-06 07:12:41 +00:00
Thomas Adam	ff3d05d92f	Merge branch 'obsd-master'	2017-09-04 12:01:11 +01:00
nicm	eadd79acec	Move to current mouse position not last when clcking in copy mode; fixes ... GitHub issue 1055. Also a man page fix from jmc.	2017-09-04 09:18:51 +00:00
Thomas Adam	d019821281	Merge branch 'obsd-master'	2017-09-02 20:01:18 +01:00
nicm	f4848b437f	Add selectp -T to set pane title.	2017-09-02 17:51:54 +00:00
Nicholas Marriott	e941e532fa	Mention GitHub for code.	2017-08-30 21:49:31 +01:00
Nicholas Marriott	a1986c5973	Add to CHANGES.	2017-08-30 21:24:16 +01:00
Nicholas Marriott	6e2b3f435a	Add to CHANGES.	2017-08-30 21:23:26 +01:00
Nicholas Marriott	07d3c4d882	Merge branch 'master' into 2.6-rc	2017-08-30 20:04:37 +01:00
Thomas Adam	f81e87f1e2	Merge branch 'obsd-master'	2017-08-30 20:01:11 +01:00
nicm	6abfd9b8ff	Instead of overloading the line clear function to mean free if ... background is default (8), introduce an explicit free function and use it where a free alone is needed. Likewise, use memmove directly rather than grid_move_lines where it makes sense. Based on a memory leak fix by Dan Aloni in GitHub issue 1051.	2017-08-30 18:13:47 +00:00
Nicholas Marriott	07c679b52d	Merge branch 'master' into 2.6-rc	2017-08-30 12:04:09 +01:00
Nicholas Marriott	b4c633cc40	Merge branch 'master' of github.com:tmux/tmux	2017-08-30 12:03:59 +01:00
Thomas Adam	54c5070767	Merge branch 'obsd-master'	2017-08-30 12:01:10 +01:00
nicm	17cf1b21c6	Pass flags into cmd_find_from_* to fix prefer-unattached, reported by ... Thomas Sattler.	2017-08-30 10:33:57 +00:00
Nicholas Marriott	8f364053ca	Add to TODO.	2017-08-30 11:21:20 +01:00
Nicholas Marriott	2e4e521629	2.6-rc version.	2017-08-30 09:34:27 +01:00
Nicholas Marriott	fa20f19494	Fix position of -v, pointed out by Thomas Sattler.	2017-08-30 09:33:53 +01:00
Nicholas Marriott	c1d8b0f74e	Back to master.	2017-08-29 22:19:46 +01:00
Nicholas Marriott	3815e4f05e	This is not true now...	2017-08-29 22:19:27 +01:00
Nicholas Marriott	72488b526b	Merge branch 'master' into 2.6-rc	2017-08-29 22:06:22 +01:00
Nicholas Marriott	5fec6c598e	Merge branch 'master' of github.com:tmux/tmux	2017-08-29 22:06:06 +01:00
Thomas Adam	dee6bb5a31	Merge branch 'obsd-master'	2017-08-29 22:01:11 +01:00
Nicholas Marriott	566b9623b3	Merge branch 'master' into 2.6-rc	2017-08-29 21:42:15 +01:00
Nicholas Marriott	3f3fb43850	More style.	2017-08-29 21:42:05 +01:00
Nicholas Marriott	2248b886fe	2.6-rc version.	2017-08-29 21:37:51 +01:00
Nicholas Marriott	82b30f2322	Style of headings.	2017-08-29 21:34:56 +01:00
Nicholas Marriott	6b841a036a	Fix example from Adam Spiers.	2017-08-29 21:32:09 +01:00