Merge branch 'obsd-master'

This commit is contained in:
Thomas Adam
2015-04-29 18:42:12 +01:00
6 changed files with 71 additions and 35 deletions

View File

@ -36,7 +36,7 @@ server_fill_environ(struct session *s, struct environ *env)
long pid;
if (s != NULL) {
term = options_get_string(&s->options, "default-terminal");
term = options_get_string(&global_options, "default-terminal");
environ_set(env, "TERM", term);
idx = s->id;