[BACK]Return to cmd-join-pane.c CVS log [TXT][DIR] Up to [local] / src / usr.bin / tmux

Diff for /src/usr.bin/tmux/cmd-join-pane.c between version 1.31 and 1.32

version 1.31, 2017/04/22 08:56:24 version 1.32, 2017/04/22 10:22:39
Line 38 
Line 38 
         .args = { "bdhvp:l:s:t:", 0, 0 },          .args = { "bdhvp:l:s:t:", 0, 0 },
         .usage = "[-bdhv] [-p percentage|-l size] " CMD_SRCDST_PANE_USAGE,          .usage = "[-bdhv] [-p percentage|-l size] " CMD_SRCDST_PANE_USAGE,
   
         .sflag = CMD_PANE_MARKED,          .source = { 's', CMD_FIND_PANE, CMD_FIND_DEFAULT_MARKED },
         .tflag = CMD_PANE,          .target = { 't', CMD_FIND_PANE, 0 },
   
         .flags = 0,          .flags = 0,
         .exec = cmd_join_pane_exec          .exec = cmd_join_pane_exec
Line 52 
Line 52 
         .args = { "bdhvp:l:s:t:", 0, 0 },          .args = { "bdhvp:l:s:t:", 0, 0 },
         .usage = "[-bdhv] [-p percentage|-l size] " CMD_SRCDST_PANE_USAGE,          .usage = "[-bdhv] [-p percentage|-l size] " CMD_SRCDST_PANE_USAGE,
   
         .sflag = CMD_PANE,          .source = { 's', CMD_FIND_PANE, 0 },
         .tflag = CMD_PANE,          .target = { 't', CMD_FIND_PANE, 0 },
   
         .flags = 0,          .flags = 0,
         .exec = cmd_join_pane_exec          .exec = cmd_join_pane_exec
Line 79 
Line 79 
         else          else
                 not_same_window = 0;                  not_same_window = 0;
   
         dst_s = item->state.tflag.s;          dst_s = item->target.s;
         dst_wl = item->state.tflag.wl;          dst_wl = item->target.wl;
         dst_wp = item->state.tflag.wp;          dst_wp = item->target.wp;
         dst_w = dst_wl->window;          dst_w = dst_wl->window;
         dst_idx = dst_wl->idx;          dst_idx = dst_wl->idx;
         server_unzoom_window(dst_w);          server_unzoom_window(dst_w);
   
         src_wl = item->state.sflag.wl;          src_wl = item->source.wl;
         src_wp = item->state.sflag.wp;          src_wp = item->source.wp;
         src_w = src_wl->window;          src_w = src_wl->window;
         server_unzoom_window(src_w);          server_unzoom_window(src_w);
   

Legend:
Removed from v.1.31  
changed lines
  Added in v.1.32