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.  
						
						 
						
						
						
						
							
  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  
					
					
						 
						
						
							
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								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