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

Diff for /src/usr.bin/tmux/cmd-attach-session.c between version 1.34 and 1.35

version 1.34, 2015/04/25 18:09:28 version 1.35, 2015/06/04 23:27:51
Line 36 
Line 36 
         "attach-session", "attach",          "attach-session", "attach",
         "c:drt:", 0, 0,          "c:drt:", 0, 0,
         "[-dr] [-c working-directory] " CMD_TARGET_SESSION_USAGE,          "[-dr] [-c working-directory] " CMD_TARGET_SESSION_USAGE,
         CMD_CANTNEST|CMD_STARTSERVER,          CMD_STARTSERVER,
         cmd_attach_session_exec          cmd_attach_session_exec
 };  };
   
Line 81 
Line 81 
   
         if (cmdq->client == NULL)          if (cmdq->client == NULL)
                 return (CMD_RETURN_NORMAL);                  return (CMD_RETURN_NORMAL);
           if (server_client_check_nested(cmdq->client)) {
                   cmdq_error(cmdq, "sessions should be nested with care, "
                       "unset $TMUX to force");
                   return (CMD_RETURN_ERROR);
           }
   
         if (wl != NULL) {          if (wl != NULL) {
                 if (wp != NULL)                  if (wp != NULL)

Legend:
Removed from v.1.34  
changed lines
  Added in v.1.35