diff options
| author | Nicholas Marriott <nicholas.marriott@gmail.com> | 2013-03-05 20:02:47 +0000 |
|---|---|---|
| committer | Nicholas Marriott <nicholas.marriott@gmail.com> | 2013-03-05 20:02:47 +0000 |
| commit | 6405fceee20c54aab10c1a3a2863861d1c0838b6 (patch) | |
| tree | 2270989948fd5671ceaf6f8eccfd68999cb356be | |
| parent | f9e46a373f1ac7155b77754b43b05ed885a9bec9 (diff) | |
| parent | d05debbe198699a84ddeaacfa4d5bf57e6afaac8 (diff) | |
| download | rtmux-6405fceee20c54aab10c1a3a2863861d1c0838b6.tar.gz rtmux-6405fceee20c54aab10c1a3a2863861d1c0838b6.tar.bz2 rtmux-6405fceee20c54aab10c1a3a2863861d1c0838b6.zip | |
Merge branch 'master' of ssh://git.code.sf.net/p/tmux/tmux-code
| -rw-r--r-- | cmd-select-pane.c | 1 | ||||
| -rw-r--r-- | tmux.1 | 2 |
2 files changed, 2 insertions, 1 deletions
diff --git a/cmd-select-pane.c b/cmd-select-pane.c index d24d7b3d..b8a12671 100644 --- a/cmd-select-pane.c +++ b/cmd-select-pane.c @@ -80,6 +80,7 @@ cmd_select_pane_exec(struct cmd *self, struct cmd_q *cmdq) return (CMD_RETURN_ERROR); } + server_unzoom_window(wl->window); window_set_active_pane(wl->window, wl->window->last); server_status_window(wl->window); server_redraw_window_borders(wl->window); @@ -1619,7 +1619,7 @@ is given in lines or cells (the default is 1). .Pp With .Fl Z , -the active pane is toggled between occupying the whole of the window and it's +the active pane is toggled between occupying the whole of the window and its normal position in the layout. .It Xo Ic respawn-pane .Op Fl k |