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

Diff for /src/usr.bin/tmux/Attic/cmd-link-window.c between version 1.12 and 1.13

version 1.12, 2012/07/11 07:10:15 version 1.13, 2013/03/24 09:54:10
Line 26 
Line 26 
  * Link a window into another session.   * Link a window into another session.
  */   */
   
 enum cmd_retval  cmd_link_window_exec(struct cmd *, struct cmd_ctx *);  enum cmd_retval  cmd_link_window_exec(struct cmd *, struct cmd_q *);
   
 const struct cmd_entry cmd_link_window_entry = {  const struct cmd_entry cmd_link_window_entry = {
         "link-window", "linkw",          "link-window", "linkw",
Line 39 
Line 39 
 };  };
   
 enum cmd_retval  enum cmd_retval
 cmd_link_window_exec(struct cmd *self, struct cmd_ctx *ctx)  cmd_link_window_exec(struct cmd *self, struct cmd_q *cmdq)
 {  {
         struct args     *args = self->args;          struct args     *args = self->args;
         struct session  *src, *dst;          struct session  *src, *dst;
Line 47 
Line 47 
         char            *cause;          char            *cause;
         int              idx, kflag, dflag;          int              idx, kflag, dflag;
   
         if ((wl = cmd_find_window(ctx, args_get(args, 's'), &src)) == NULL)          if ((wl = cmd_find_window(cmdq, args_get(args, 's'), &src)) == NULL)
                 return (CMD_RETURN_ERROR);                  return (CMD_RETURN_ERROR);
         if ((idx = cmd_find_index(ctx, args_get(args, 't'), &dst)) == -2)          if ((idx = cmd_find_index(cmdq, args_get(args, 't'), &dst)) == -2)
                 return (CMD_RETURN_ERROR);                  return (CMD_RETURN_ERROR);
   
         kflag = args_has(self->args, 'k');          kflag = args_has(self->args, 'k');
         dflag = args_has(self->args, 'd');          dflag = args_has(self->args, 'd');
         if (server_link_window(src, wl, dst, idx, kflag, !dflag, &cause) != 0) {          if (server_link_window(src, wl, dst, idx, kflag, !dflag, &cause) != 0) {
                 ctx->error(ctx, "can't link window: %s", cause);                  cmdq_error(cmdq, "can't link window: %s", cause);
                 free(cause);                  free(cause);
                 return (CMD_RETURN_ERROR);                  return (CMD_RETURN_ERROR);
         }          }
Legend:
Removed from v.1.12  
changed lines
  Added in v.1.13