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

Diff for /src/usr.bin/tmux/cmd-swap-window.c between version 1.19 and 1.20

version 1.19, 2016/10/13 22:48:51 version 1.20, 2016/10/16 19:04:05
Line 26 
Line 26 
  * Swap one window with another.   * Swap one window with another.
  */   */
   
 static enum cmd_retval  cmd_swap_window_exec(struct cmd *, struct cmd_q *);  static enum cmd_retval  cmd_swap_window_exec(struct cmd *, struct cmdq_item *);
   
 const struct cmd_entry cmd_swap_window_entry = {  const struct cmd_entry cmd_swap_window_entry = {
         .name = "swap-window",          .name = "swap-window",
Line 43 
Line 43 
 };  };
   
 static enum cmd_retval  static enum cmd_retval
 cmd_swap_window_exec(struct cmd *self, struct cmd_q *cmdq)  cmd_swap_window_exec(struct cmd *self, struct cmdq_item *item)
 {  {
         struct session          *src, *dst;          struct session          *src, *dst;
         struct session_group    *sg_src, *sg_dst;          struct session_group    *sg_src, *sg_dst;
         struct winlink          *wl_src, *wl_dst;          struct winlink          *wl_src, *wl_dst;
         struct window           *w;          struct window           *w;
   
         wl_src = cmdq->state.sflag.wl;          wl_src = item->state.sflag.wl;
         src = cmdq->state.sflag.s;          src = item->state.sflag.s;
         sg_src = session_group_find(src);          sg_src = session_group_find(src);
   
         wl_dst = cmdq->state.tflag.wl;          wl_dst = item->state.tflag.wl;
         dst = cmdq->state.tflag.s;          dst = item->state.tflag.s;
         sg_dst = session_group_find(dst);          sg_dst = session_group_find(dst);
   
         if (src != dst && sg_src != NULL && sg_dst != NULL &&          if (src != dst && sg_src != NULL && sg_dst != NULL &&
             sg_src == sg_dst) {              sg_src == sg_dst) {
                 cmdq_error(cmdq, "can't move window, sessions are grouped");                  cmdq_error(item, "can't move window, sessions are grouped");
                 return (CMD_RETURN_ERROR);                  return (CMD_RETURN_ERROR);
         }          }
   

Legend:
Removed from v.1.19  
changed lines
  Added in v.1.20