Merge branch 'obsd-master'

Conflicts:
	Makefile
	tmux.1
This commit is contained in:
Thomas Adam
2015-04-27 21:21:55 +01:00
18 changed files with 1330 additions and 1089 deletions

View File

@ -92,7 +92,7 @@ cmd_save_buffer_exec(struct cmd *self, struct cmd_q *cmdq)
if (c != NULL && c->session == NULL)
cwd = c->cwd;
else if ((s = cmd_current_session(cmdq, 0)) != NULL)
else if ((s = cmd_find_current(cmdq)) != NULL)
cwd = s->cwd;
else
cwd = AT_FDCWD;