circlecloud/tmux
1
0
Fork 0
mirror of https://github.com/tmux/tmux.git synced 2025-09-03 06:17:04 +00:00
Code Issues Projects Releases Wiki Activity

Merge branch 'obsd-master'

Browse Source
This commit is contained in:
Thomas Adam
2015-10-28 12:01:11 +00:00
parent da1f6fc2c8 bf9c933cae
commit a5e4d3a2d8
19 changed files with 125 additions and 101 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
format.c
View File

@ -648,9 +648,9 @@ format_find(struct format_tree *ft, const char *key, int modifiers)
if (~modifiers & FORMAT_TIMESTRING) {
envent = NULL;
if (ft->s != NULL)
envent = environ_find(&ft->s->environ, key);
envent = environ_find(ft->s->environ, key);
if (envent == NULL)
envent = environ_find(&global_environ, key);
envent = environ_find(global_environ, key);
if (envent != NULL) {
found = envent->value;
goto found;