circlecloud/tmux
1
0
Fork 0
mirror of https://github.com/tmux/tmux.git synced 2025-09-02 13:37:12 +00:00
Code Issues Projects Releases Wiki Activity

Sync OpenBSD patchset 290:

Browse Source 
When using source-file, run the commands in the context of the source-file
command rather than with no context. This makes things like attach work from a
file.
This commit is contained in:
Tiago Cunha
2009-08-24 16:27:03 +00:00
parent 2e2e762743
commit 35b926c445
4 changed files with 18 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
server.c
View File

@ -1,4 +1,4 @@
/* $Id: server.c,v 1.174 2009-08-20 11:45:37 tcunha Exp $ */
/* $Id: server.c,v 1.175 2009-08-24 16:27:03 tcunha Exp $ */
/*
* Copyright (c) 2007 Nicholas Marriott <nicm@users.sourceforge.net>
@ -191,9 +191,9 @@ server_start(char *path)
&cause, "%s: %s", strerror(errno), SYSTEM_CFG);
goto error;
}
} else if (load_cfg(SYSTEM_CFG, &cause) != 0)
} else if (load_cfg(SYSTEM_CFG, NULL, &cause) != 0)
goto error;
if (cfg_file != NULL && load_cfg(cfg_file, &cause) != 0)
if (cfg_file != NULL && load_cfg(cfg_file, NULL, &cause) != 0)
goto error;
exit(server_main(srv_fd));