=================================================================== RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/tmux/cmd-queue.c,v retrieving revision 1.13 retrieving revision 1.14 diff -c -r1.13 -r1.14 *** src/usr.bin/tmux/cmd-queue.c 2013/10/10 12:12:54 1.13 --- src/usr.bin/tmux/cmd-queue.c 2013/10/10 12:26:35 1.14 *************** *** 1,4 **** ! /* $OpenBSD: cmd-queue.c,v 1.13 2013/10/10 12:12:54 nicm Exp $ */ /* * Copyright (c) 2013 Nicholas Marriott --- 1,4 ---- ! /* $OpenBSD: cmd-queue.c,v 1.14 2013/10/10 12:26:35 nicm Exp $ */ /* * Copyright (c) 2013 Nicholas Marriott *************** *** 282,309 **** free(item); } cmdq->item = NULL; - } - - /* Get default path using command queue. */ - const char * - cmdq_default_path(struct cmd_q *cmdq, const char *cwd) - { - struct client *c = cmdq->client; - struct session *s; - const char *current; - - if ((s = cmd_current_session(cmdq, 0)) == NULL) - return (NULL); - - if (cwd == NULL) - cwd = options_get_string(&s->options, "default-path"); - - if (c != NULL && c->session == NULL && c->cwd != NULL) - current = c->cwd; - else if (s->curw != NULL) - current = get_proc_cwd(s->curw->window->active->fd); - else - current = NULL; - - return (cmd_default_path(s->cwd, current, cwd)); } --- 282,285 ----