summaryrefslogtreecommitdiff
path: root/usr.bin
diff options
context:
space:
mode:
authorNicholas Marriott <nicm@cvs.openbsd.org>2013-10-05 13:56:49 +0000
committerNicholas Marriott <nicm@cvs.openbsd.org>2013-10-05 13:56:49 +0000
commit25cdfdae8b953b1421d00028fee83db9fbc14be0 (patch)
tree52c86af678c934a7dda95233eab7a3e9d7a814ed /usr.bin
parent0beaad422a9168bdd80b1e6475d2c91ca8dd0dab (diff)
Change the default for the default-path option to ~. This is a quick
change to turn off the KERN_PROC_CWD code which is unpredictable. Later it will go away and there may be other changes to how this works.
Diffstat (limited to 'usr.bin')
-rw-r--r--usr.bin/tmux/options-table.c4
-rw-r--r--usr.bin/tmux/tmux.18
2 files changed, 7 insertions, 5 deletions
diff --git a/usr.bin/tmux/options-table.c b/usr.bin/tmux/options-table.c
index 2764bc097de..90bd2915ad4 100644
--- a/usr.bin/tmux/options-table.c
+++ b/usr.bin/tmux/options-table.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: options-table.c,v 1.38 2013/06/23 13:10:46 nicm Exp $ */
+/* $OpenBSD: options-table.c,v 1.39 2013/10/05 13:56:48 nicm Exp $ */
/*
* Copyright (c) 2011 Nicholas Marriott <nicm@users.sourceforge.net>
@@ -128,7 +128,7 @@ const struct options_table_entry session_options_table[] = {
{ .name = "default-path",
.type = OPTIONS_TABLE_STRING,
- .default_str = ""
+ .default_str = "~"
},
{ .name = "default-shell",
diff --git a/usr.bin/tmux/tmux.1 b/usr.bin/tmux/tmux.1
index db3849bf05d..a0f74dae320 100644
--- a/usr.bin/tmux/tmux.1
+++ b/usr.bin/tmux/tmux.1
@@ -1,4 +1,4 @@
-.\" $OpenBSD: tmux.1,v 1.364 2013/07/16 00:07:52 schwarze Exp $
+.\" $OpenBSD: tmux.1,v 1.365 2013/10/05 13:56:48 nicm Exp $
.\"
.\" Copyright (c) 2007 Nicholas Marriott <nicm@users.sourceforge.net>
.\"
@@ -14,7 +14,7 @@
.\" IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING
.\" OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
.\"
-.Dd $Mdocdate: July 16 2013 $
+.Dd $Mdocdate: October 5 2013 $
.Dt TMUX 1
.Os
.Sh NAME
@@ -2173,13 +2173,15 @@ to create a login shell using the value of the
option.
.It Ic default-path Ar path
Set the default working directory for new panes.
-If empty (the default), the working directory is determined from the process
+If empty, the working directory is determined from the process
running in the active pane, from the command line environment or from the
working directory where the session was created.
Otherwise the same options are available as for the
.Fl c
flag to
.Ic new-window .
+The default is
+.Ql ~ .
.It Ic default-shell Ar path
Specify the default shell.
This is used as the login shell for new windows when the