summaryrefslogtreecommitdiff
path: root/usr.bin/tmux/tmux.h
diff options
context:
space:
mode:
Diffstat (limited to 'usr.bin/tmux/tmux.h')
-rw-r--r--usr.bin/tmux/tmux.h9
1 files changed, 5 insertions, 4 deletions
diff --git a/usr.bin/tmux/tmux.h b/usr.bin/tmux/tmux.h
index fdae389a737..65568f79ad2 100644
--- a/usr.bin/tmux/tmux.h
+++ b/usr.bin/tmux/tmux.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: tmux.h,v 1.582 2015/11/18 14:27:44 nicm Exp $ */
+/* $OpenBSD: tmux.h,v 1.583 2015/11/19 22:46:46 nicm Exp $ */
/*
* Copyright (c) 2007 Nicholas Marriott <nicm@users.sourceforge.net>
@@ -33,6 +33,8 @@
#include <stdio.h>
#include <termios.h>
+#include "xmalloc.h"
+
extern char *__progname;
extern char **environ;
@@ -45,8 +47,6 @@ struct session;
struct tmuxpeer;
struct tmuxproc;
-#include "xmalloc.h"
-
/* Default global configuration file. */
#define TMUX_CONF "/etc/tmux.conf"
@@ -1014,6 +1014,7 @@ struct session {
struct options *options;
#define SESSION_UNATTACHED 0x1 /* not attached to any clients */
+#define SESSION_PASTING 0x2
int flags;
u_int attached;
@@ -1147,7 +1148,7 @@ struct tty {
struct tty_key *key_tree;
};
-/* TTY command context and function pointer. */
+/* TTY command context. */
struct tty_ctx {
struct window_pane *wp;