7899 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
Nicholas Marriott	d6edd06749	Merge branch 'master' of github.com:tmux/tmux	2017-10-25 12:29:23 +01:00
Nicholas Marriott	6e8d29e9a2	Update TODO.	2017-10-25 12:29:10 +01:00
nicm	8dd776106d	Add P key to paste tagged in buffer mode, and trim some code that should ... no longer be necessary.	2017-10-25 11:26:11 +00:00
Thomas Adam	e85213a944	Merge branch 'obsd-master'	2017-10-22 15:47:07 +01:00
nicm	26f1857154	Use window_pane_index() when drawing pane numbers (so pane-base-index is ... applied), from Thomas Adam. GitHub issue 1125.	2017-10-22 13:16:54 +00:00
Nicholas Marriott	f7a037ba26	Apparently vim(1) now has syntax highlighting built in, GitHub issue 1124.	2017-10-22 14:14:14 +01:00
Thomas Adam	61114c6c72	Merge branch 'obsd-master'	2017-10-20 16:01:17 +01:00
nicm	d3e8709ab5	Clear status line with spaces again so reverse works, spotted by sthen.	2017-10-20 13:10:54 +00:00
Nicholas Marriott	37531673a3	Need compat for queue.h.	2017-10-20 13:26:54 +01:00
Thomas Adam	31901e3c07	Merge branch 'obsd-master' ... Conflicts: server-fn.c	2017-10-20 12:36:29 +01:00
Nicholas Marriott	a34de2e378	Save and restore LIBS when checking for b64_ntop, reported by Ralf Friedl.	2017-10-17 10:35:35 +01:00
nicm	2f6935a630	Infrastructure for drawing status lines of more than one line in height, ... still only one is allowed but this lets tmux draw bigger ones.	2017-10-16 19:30:53 +00:00
nicm	a5fd5782f8	Show exit status and time in the remain-on-exit pane text, mostly from ... Timo Boettcher in GitHub issue 1103.	2017-10-12 11:32:27 +00:00
Nicholas Marriott	fb02df66cc	Merge branch 'master' of github.com:tmux/tmux	2017-10-12 11:56:32 +01:00
Nicholas Marriott	d10def5b0b	Check missed during merge.	2017-10-12 11:56:06 +01:00
Thomas Adam	2357bfb254	Merge branch 'obsd-master'	2017-10-11 16:01:17 +01:00
Thomas Adam	87babfa473	Merge branch 'obsd-master'	2017-10-11 14:01:17 +01:00
nicm	eb9839fd32	Box around label in preview.	2017-10-11 12:57:49 +00:00
nicm	6e5121be7e	Clear to end of line properly with UTF-8 present.	2017-10-11 11:26:58 +00:00
Thomas Adam	4efd41f3af	Merge branch 'obsd-master'	2017-10-11 10:01:19 +01:00
nicm	99351c9cae	Add C-n and C-p keys for tree mode, and choose the right initial line ... when no panes.	2017-10-11 08:08:16 +00:00
Nicholas Marriott	60074a6bc6	Merge branch 'master' of github.com:tmux/tmux	2017-10-11 08:03:55 +01:00
Nicholas Marriott	a3967de9a5	Include headers if found regardless of forkpty.	2017-10-11 08:03:31 +01:00
Thomas Adam	044019d9d6	Merge branch 'obsd-master'	2017-10-09 14:01:16 +01:00
nicm	db44151a37	kind should be S-Down not S-Up.	2017-10-09 11:35:35 +00:00
Thomas Adam	ceab7154d4	Merge branch 'obsd-master'	2017-10-08 18:40:41 +01:00
nicm	0b4c408168	Fix description of history_size, from Campbell Barton.	2017-10-08 16:45:01 +00:00
Thomas Adam	f069c0ba09	Merge branch 'obsd-master'	2017-10-06 20:01:17 +01:00
nicm	9c4caf49a2	Support %else in config files to match %if, from Brad Town in GitHub ... issue 1071.	2017-10-06 18:02:30 +00:00
Thomas Adam	2be01ab4ec	Merge branch 'obsd-master'	2017-10-06 13:33:32 +01:00
nicm	b462063cd5	Add -- to some key bindings so leading -s work.	2017-10-05 13:43:34 +00:00
Nicholas Marriott	8aaf86a6ea	Merge branch '2.6-rc'	2017-10-05 14:39:33 +01:00
Nicholas Marriott	bd71cbbe27	2.6.	2017-10-05 14:31:23 +01:00
nicm	88517ceebb	Add support for the xterm(1) title stack, from Brad Town, GitHub issue ... 1075.	2017-10-05 13:29:18 +00:00
nicm	6a292f09ba	When writing batches of characters to the screen, we need to clear ... padding or later UTF-8 characters could be displayed incorrectly. GitHub issue 1090.	2017-10-05 08:12:24 +00:00
nicm	71ec616e4d	Initialize alerts timer event where it is used, avoids crash with new windows.	2017-09-22 17:58:30 +01:00
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	a8b84b7cfa	2.6-rc3.	2017-09-11 10:08:28 +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