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

Diff for /src/usr.bin/tmux/cmd-kill-window.c between version 1.16 and 1.17

version 1.16, 2014/10/22 23:11:41 version 1.17, 2015/05/06 08:35:39
Line 45 
Line 45 
 enum cmd_retval  enum cmd_retval
 cmd_kill_window_exec(struct cmd *self, struct cmd_q *cmdq)  cmd_kill_window_exec(struct cmd *self, struct cmd_q *cmdq)
 {  {
         struct args             *args = self->args;          struct args     *args = self->args;
         struct winlink          *wl, *wl2, *wl3;          struct winlink  *wl, *wl2, *wl3;
         struct window           *w;          struct window   *w;
         struct session          *s;          struct session  *s;
         struct session_group    *sg;  
         u_int                    references;  
   
         if ((wl = cmd_find_window(cmdq, args_get(args, 't'), &s)) == NULL)          if ((wl = cmd_find_window(cmdq, args_get(args, 't'), &s)) == NULL)
                 return (CMD_RETURN_ERROR);                  return (CMD_RETURN_ERROR);
         w = wl->window;          w = wl->window;
   
         if (self->entry == &cmd_unlink_window_entry) {          if (self->entry == &cmd_unlink_window_entry) {
                 sg = session_group_find(s);                  if (!args_has(self->args, 'k') && !session_is_linked(s, w)) {
                 if (sg != NULL)  
                         references = session_group_count(sg);  
                 else  
                         references = 1;  
                 if (!args_has(self->args, 'k') && w->references == references) {  
                         cmdq_error(cmdq, "window only linked to one session");                          cmdq_error(cmdq, "window only linked to one session");
                         return (CMD_RETURN_ERROR);                          return (CMD_RETURN_ERROR);
                 }                  }
Legend:
Removed from v.1.16  
changed lines
  Added in v.1.17