If it exist, load a system-wide configuration file /etc/tmux.conf before any

user-specified one.
This commit is contained in:
Nicholas Marriott
2009-07-14 06:38:14 +00:00
parent 2f75b07d08
commit d2c3dbc665
6 changed files with 31 additions and 11 deletions

View File

@ -1,4 +1,4 @@
/* $Id: cmd-string.c,v 1.19 2009-07-13 18:03:18 tcunha Exp $ */
/* $Id: cmd-string.c,v 1.20 2009-07-14 06:38:14 nicm Exp $ */
/*
* Copyright (c) 2008 Nicholas Marriott <nicm@users.sourceforge.net>
@ -158,13 +158,16 @@ cmd_string_parse(const char *s, struct cmd_list **cmdlist, char **cause)
rval = 0;
goto out;
case '~':
if (have_arg == 0) {
if ((t = cmd_string_expand_tilde(s, &p)) == NULL)
if (!have_arg) {
t = cmd_string_expand_tilde(s, &p);
if (t == NULL)
goto error;
buf = xrealloc(buf, 1, len + strlen(t) + 1);
strlcpy(buf + len, t, strlen(t) + 1);
len += strlen(t);
xfree(t);
have_arg = 1;
break;
}
/* FALLTHROUGH */