mirror of
				https://github.com/tmux/tmux.git
				synced 2025-11-04 01:34:18 +00:00 
			
		
		
		
	Merge branch 'obsd-master'
This commit is contained in:
		@@ -24,12 +24,6 @@
 | 
				
			|||||||
 | 
					
 | 
				
			||||||
#include "tmux.h"
 | 
					#include "tmux.h"
 | 
				
			||||||
 | 
					
 | 
				
			||||||
#define DEFAULT_CLIENT_MENU \
 | 
					 | 
				
			||||||
	" 'Detach' 'd' {detach-client}" \
 | 
					 | 
				
			||||||
	" 'Detach & Kill' 'X' {detach-client -P}" \
 | 
					 | 
				
			||||||
	" 'Detach Others' 'o' {detach-client -a}" \
 | 
					 | 
				
			||||||
	" ''" \
 | 
					 | 
				
			||||||
	" 'Lock' 'l' {lock-client}"
 | 
					 | 
				
			||||||
#define DEFAULT_SESSION_MENU \
 | 
					#define DEFAULT_SESSION_MENU \
 | 
				
			||||||
	" 'Next' 'n' {switch-client -n}" \
 | 
						" 'Next' 'n' {switch-client -n}" \
 | 
				
			||||||
	" 'Previous' 'p' {switch-client -p}" \
 | 
						" 'Previous' 'p' {switch-client -p}" \
 | 
				
			||||||
@@ -325,7 +319,6 @@ key_bindings_init(void)
 | 
				
			|||||||
		"bind -n MouseDrag1Pane if -Ft= '#{mouse_any_flag}' 'if -Ft= \"#{pane_in_mode}\" \"copy-mode -M\" \"send-keys -M\"' 'copy-mode -M'",
 | 
							"bind -n MouseDrag1Pane if -Ft= '#{mouse_any_flag}' 'if -Ft= \"#{pane_in_mode}\" \"copy-mode -M\" \"send-keys -M\"' 'copy-mode -M'",
 | 
				
			||||||
		"bind -n WheelUpPane if -Ft= '#{mouse_any_flag}' 'send-keys -M' 'if -Ft= \"#{pane_in_mode}\" \"send-keys -M\" \"copy-mode -et=\"'",
 | 
							"bind -n WheelUpPane if -Ft= '#{mouse_any_flag}' 'send-keys -M' 'if -Ft= \"#{pane_in_mode}\" \"send-keys -M\" \"copy-mode -et=\"'",
 | 
				
			||||||
 | 
					
 | 
				
			||||||
		"bind -n MouseDown3StatusRight display-menu -t= -xM -yS -T \"#[align=centre]#{client_name}\" " DEFAULT_CLIENT_MENU,
 | 
					 | 
				
			||||||
		"bind -n MouseDown3StatusLeft display-menu -t= -xM -yS -T \"#[align=centre]#{session_name}\" " DEFAULT_SESSION_MENU,
 | 
							"bind -n MouseDown3StatusLeft display-menu -t= -xM -yS -T \"#[align=centre]#{session_name}\" " DEFAULT_SESSION_MENU,
 | 
				
			||||||
		"bind -n MouseDown3Status display-menu -t= -xW -yS -T \"#[align=centre]#{window_index}:#{window_name}\" " DEFAULT_WINDOW_MENU,
 | 
							"bind -n MouseDown3Status display-menu -t= -xW -yS -T \"#[align=centre]#{window_index}:#{window_name}\" " DEFAULT_WINDOW_MENU,
 | 
				
			||||||
		"bind < display-menu -xW -yS -T \"#[align=centre]#{window_index}:#{window_name}\" " DEFAULT_WINDOW_MENU,
 | 
							"bind < display-menu -xW -yS -T \"#[align=centre]#{window_index}:#{window_name}\" " DEFAULT_WINDOW_MENU,
 | 
				
			||||||
 
 | 
				
			|||||||
		Reference in New Issue
	
	Block a user