The branch, hooks has been updated
       via  0136562513d2e12b0d2c56d6cb67e705cb1b7fb7 (commit)
      from  50c2cf56cfb4782bd02ac65588af51f4cca17767 (commit)

- Log -----------------------------------------------------------------
commit 0136562513d2e12b0d2c56d6cb67e705cb1b7fb7
Author: Nicholas Marriott <nicholas.marri...@gmail.com>
Commit: Nicholas Marriott <nicholas.marri...@gmail.com>

    Don't alter spacing.
---
 cmd-attach-session.c |    6 ++----
 1 files changed, 2 insertions(+), 4 deletions(-)

diff --git a/cmd-attach-session.c b/cmd-attach-session.c
index 7dbf503..160f2a8 100644
--- a/cmd-attach-session.c
+++ b/cmd-attach-session.c
@@ -36,7 +36,7 @@ const struct cmd_entry cmd_attach_session_entry = {
        "attach-session", "attach",
        "c:drt:", 0, 0,
        "[-dr] [-c working-directory] " CMD_TARGET_SESSION_USAGE,
-       CMD_CANTNEST|CMD_STARTSERVER|CMD_PREPARESESSION,
+       CMD_CANTNEST|CMD_STARTSERVER,
        cmd_attach_session_exec
 };
 
@@ -76,8 +76,6 @@ cmd_attach_session(struct cmd_q *cmdq, const char *tflag, int 
dflag, int rflag,
                if (w != NULL)
                        wl = winlink_find_by_window(&s->windows, w);
        }
-       if ((s = cmdq->state.s) == NULL)
-               return (CMD_RETURN_ERROR);
 
        if (cmdq->client == NULL)
                return (CMD_RETURN_NORMAL);
@@ -192,5 +190,5 @@ cmd_attach_session_exec(struct cmd *self, struct cmd_q 
*cmdq)
        struct args     *args = self->args;
 
        return (cmd_attach_session(cmdq, args_get(args, 't'),
-               args_has(args, 'd'), args_has(args, 'r'), args_get(args, 'c')));
+           args_has(args, 'd'), args_has(args, 'r'), args_get(args, 'c')));
 }


-----------------------------------------------------------------------

Summary of changes:
 cmd-attach-session.c |    6 ++----
 1 files changed, 2 insertions(+), 4 deletions(-)


hooks/post-receive
-- 
tmux

------------------------------------------------------------------------------
Dive into the World of Parallel Programming. The Go Parallel Website,
sponsored by Intel and developed in partnership with Slashdot Media, is your
hub for all things parallel software development, from weekly thought
leadership blogs to news, videos, case studies, tutorials and more. Take a
look and join the conversation now. http://goparallel.sourceforge.net/
_______________________________________________
tmux-cvs mailing list
tmux-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/tmux-cvs

Reply via email to