[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.20 and 1.21

version 1.20, 2016/10/16 19:04:05 version 1.21, 2016/12/14 17:38:59
Line 48 
Line 48 
         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_src, *w_dst;
   
         wl_src = item->state.sflag.wl;          wl_src = item->state.sflag.wl;
         src = item->state.sflag.s;          src = item->state.sflag.s;
Line 67 
Line 67 
         if (wl_dst->window == wl_src->window)          if (wl_dst->window == wl_src->window)
                 return (CMD_RETURN_NORMAL);                  return (CMD_RETURN_NORMAL);
   
         w = wl_dst->window;          w_dst = wl_dst->window;
         wl_dst->window = wl_src->window;          TAILQ_REMOVE(&w_dst->winlinks, wl_dst, wentry);
         wl_src->window = w;          w_src = wl_src->window;
           TAILQ_REMOVE(&w_src->winlinks, wl_src, wentry);
   
           wl_dst->window = w_src;
           TAILQ_INSERT_TAIL(&w_src->winlinks, wl_dst, wentry);
           wl_src->window = w_dst;
           TAILQ_INSERT_TAIL(&w_dst->winlinks, wl_src, wentry);
   
         if (!args_has(self->args, 'd')) {          if (!args_has(self->args, 'd')) {
                 session_select(dst, wl_dst->idx);                  session_select(dst, wl_dst->idx);

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