[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.19 and 1.20

version 1.19, 2015/06/18 23:56:01 version 1.20, 2015/12/13 14:32:38
Line 37 
Line 37 
         "join-pane", "joinp",          "join-pane", "joinp",
         "bdhvp:l:s:t:", 0, 0,          "bdhvp:l:s:t:", 0, 0,
         "[-bdhv] [-p percentage|-l size] " CMD_SRCDST_PANE_USAGE,          "[-bdhv] [-p percentage|-l size] " CMD_SRCDST_PANE_USAGE,
         0,          CMD_PANE_MARKED_S|CMD_PANE_T,
         cmd_join_pane_exec          cmd_join_pane_exec
 };  };
   
Line 45 
Line 45 
         "move-pane", "movep",          "move-pane", "movep",
         "bdhvp:l:s:t:", 0, 0,          "bdhvp:l:s:t:", 0, 0,
         "[-bdhv] [-p percentage|-l size] " CMD_SRCDST_PANE_USAGE,          "[-bdhv] [-p percentage|-l size] " CMD_SRCDST_PANE_USAGE,
         0,          CMD_PANE_S|CMD_PANE_T,
         cmd_join_pane_exec          cmd_join_pane_exec
 };  };
   
Line 68 
Line 68 
         enum layout_type         type;          enum layout_type         type;
         struct layout_cell      *lc;          struct layout_cell      *lc;
   
         dst_wl = cmd_find_pane(cmdq, args_get(args, 't'), &dst_s, &dst_wp);          dst_s = cmdq->state.tflag.s;
         if (dst_wl == NULL)          dst_wl = cmdq->state.tflag.wl;
                 return (CMD_RETURN_ERROR);          dst_wp = cmdq->state.tflag.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 = cmd_find_pane_marked(cmdq, args_get(args, 's'), NULL, &src_wp);          src_wl = cmdq->state.sflag.wl;
         if (src_wl == NULL)          src_wp = cmdq->state.sflag.wp;
                 return (CMD_RETURN_ERROR);  
         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.19  
changed lines
  Added in v.1.20