mirror of
https://github.com/tmux/tmux.git
synced 2026-06-21 09:45:41 +00:00
Merge branch 'obsd-master'
This commit is contained in:
@@ -90,7 +90,7 @@ cmd_split_window_exec(struct cmd *self, struct cmdq_item *item)
|
|||||||
u_int count = args_count(args);
|
u_int count = args_count(args);
|
||||||
|
|
||||||
if (cmd_get_entry(self) == &cmd_new_pane_entry)
|
if (cmd_get_entry(self) == &cmd_new_pane_entry)
|
||||||
is_floating = 0; /* !args_has(args, 'L'); */
|
is_floating = !args_has(args, 'L');
|
||||||
else
|
else
|
||||||
is_floating = 0;
|
is_floating = 0;
|
||||||
input = (args_has(args, 'I') && count == 0);
|
input = (args_has(args, 'I') && count == 0);
|
||||||
|
|||||||
@@ -79,7 +79,7 @@ cmd_swap_pane_exec(struct cmd *self, struct cmdq_item *item)
|
|||||||
if (src_wp == dst_wp)
|
if (src_wp == dst_wp)
|
||||||
goto out;
|
goto out;
|
||||||
|
|
||||||
if (window_pane_is_floating(src_wp) &&
|
if (window_pane_is_floating(src_wp) ||
|
||||||
window_pane_is_floating(dst_wp)) {
|
window_pane_is_floating(dst_wp)) {
|
||||||
cmdq_error(item, "cannot swap floating panes");
|
cmdq_error(item, "cannot swap floating panes");
|
||||||
return (CMD_RETURN_ERROR);
|
return (CMD_RETURN_ERROR);
|
||||||
|
|||||||
@@ -362,6 +362,7 @@ key_bindings_init(void)
|
|||||||
"bind -N 'Split window horizontally' % { split-window -h }",
|
"bind -N 'Split window horizontally' % { split-window -h }",
|
||||||
"bind -N 'Kill current window' & { confirm-before -p\"kill-window #W? (y/n)\" kill-window }",
|
"bind -N 'Kill current window' & { confirm-before -p\"kill-window #W? (y/n)\" kill-window }",
|
||||||
"bind -N 'Prompt for window index to select' \"'\" { command-prompt -T window-target -pindex { select-window -t ':%%' } }",
|
"bind -N 'Prompt for window index to select' \"'\" { command-prompt -T window-target -pindex { select-window -t ':%%' } }",
|
||||||
|
"bind -N 'New floating pane' * { new-pane }",
|
||||||
"bind -N 'Switch to previous client' ( { switch-client -p }",
|
"bind -N 'Switch to previous client' ( { switch-client -p }",
|
||||||
"bind -N 'Switch to next client' ) { switch-client -n }",
|
"bind -N 'Switch to next client' ) { switch-client -n }",
|
||||||
"bind -N 'Rename current window' , { command-prompt -I'#W' { rename-window -- '%%' } }",
|
"bind -N 'Rename current window' , { command-prompt -I'#W' { rename-window -- '%%' } }",
|
||||||
|
|||||||
2
tmux.1
2
tmux.1
@@ -298,6 +298,8 @@ Prompt for a window index to select.
|
|||||||
Switch the attached client to the previous session.
|
Switch the attached client to the previous session.
|
||||||
.It \&)
|
.It \&)
|
||||||
Switch the attached client to the next session.
|
Switch the attached client to the next session.
|
||||||
|
.It *
|
||||||
|
Create a new floating pane.
|
||||||
.It ,
|
.It ,
|
||||||
Rename the current window.
|
Rename the current window.
|
||||||
.It \-
|
.It \-
|
||||||
|
|||||||
Reference in New Issue
Block a user