summaryrefslogtreecommitdiffstats
path: root/usr.bin/tmux/tmux.c
diff options
context:
space:
mode:
authornicm <nicm@openbsd.org>2010-12-30 23:16:18 +0000
committernicm <nicm@openbsd.org>2010-12-30 23:16:18 +0000
commiteca05f1fc0ec6fc9c207193ddcba9f00995f6fdc (patch)
treecdf0e9851374e23108b26ce7898d7395f78cbbb4 /usr.bin/tmux/tmux.c
parentbe more cynical about boot-time entropy, and fold time and entropy data in. (diff)
downloadwireguard-openbsd-eca05f1fc0ec6fc9c207193ddcba9f00995f6fdc.tar.xz
wireguard-openbsd-eca05f1fc0ec6fc9c207193ddcba9f00995f6fdc.zip
Change from a per-session stack of buffers to one global stack which is
much more convenient and also simplifies lot of code. This renders copy-buffer useless and makes buffer-limit now a server option. By Tiago Cunha.
Diffstat (limited to 'usr.bin/tmux/tmux.c')
-rw-r--r--usr.bin/tmux/tmux.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/usr.bin/tmux/tmux.c b/usr.bin/tmux/tmux.c
index 75f1a1da14c..67abae269b2 100644
--- a/usr.bin/tmux/tmux.c
+++ b/usr.bin/tmux/tmux.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: tmux.c,v 1.97 2010/12/19 18:35:08 nicm Exp $ */
+/* $OpenBSD: tmux.c,v 1.98 2010/12/30 23:16:18 nicm Exp $ */
/*
* Copyright (c) 2007 Nicholas Marriott <nicm@users.sourceforge.net>
@@ -320,12 +320,12 @@ main(int argc, char **argv)
options_set_number(oo, "quiet", quiet);
options_set_number(oo, "escape-time", 500);
options_set_number(oo, "exit-unattached", 0);
+ options_set_number(oo, "buffer-limit", 9);
options_init(&global_s_options, NULL);
so = &global_s_options;
options_set_number(so, "base-index", 0);
options_set_number(so, "bell-action", BELL_ANY);
- options_set_number(so, "buffer-limit", 9);
options_set_string(so, "default-command", "%s", "");
options_set_string(so, "default-path", "%s", "");
options_set_string(so, "default-shell", "%s", getshell());