[BACK]Return to server-client.c CVS log [TXT][DIR] Up to [local] / src / usr.bin / tmux

Diff for /src/usr.bin/tmux/server-client.c between version 1.118 and 1.119

version 1.118, 2014/02/17 22:42:20 version 1.119, 2014/02/23 00:53:06
Line 114 
Line 114 
   
 /* Open client terminal if needed. */  /* Open client terminal if needed. */
 int  int
 server_client_open(struct client *c, struct session *s, char **cause)  server_client_open(struct client *c, char **cause)
 {  {
         struct options  *oo = s != NULL ? &s->options : &global_s_options;  
         char            *overrides;  
   
         if (c->flags & CLIENT_CONTROL)          if (c->flags & CLIENT_CONTROL)
                 return (0);                  return (0);
   
Line 127 
Line 124 
                 return (-1);                  return (-1);
         }          }
   
         overrides = options_get_string(oo, "terminal-overrides");          if (tty_open(&c->tty, cause) != 0)
         if (tty_open(&c->tty, overrides, cause) != 0)  
                 return (-1);                  return (-1);
   
         return (0);          return (0);
Legend:
Removed from v.1.118  
changed lines
  Added in v.1.119