aboutsummaryrefslogtreecommitdiff
path: root/tmux.h
diff options
context:
space:
mode:
authornicm <nicm>2015-06-04 23:27:51 +0000
committernicm <nicm>2015-06-04 23:27:51 +0000
commit6b2129696fbefe44d0adce1f2a11b4ae477cd07e (patch)
treed204c7289caf70e18ea66fe75a7e3a0e668fd844 /tmux.h
parentdc0d34e13792ff14b5c02fac01af013dfe111c83 (diff)
downloadrtmux-6b2129696fbefe44d0adce1f2a11b4ae477cd07e.tar.gz
rtmux-6b2129696fbefe44d0adce1f2a11b4ae477cd07e.tar.bz2
rtmux-6b2129696fbefe44d0adce1f2a11b4ae477cd07e.zip
Move the nested check from client to server and compare the client tty
name to all the pane pty names instead of comparing socket paths. This means that "new -d" will work without unsetting $TMUX.
Diffstat (limited to 'tmux.h')
-rw-r--r--tmux.h4
1 files changed, 2 insertions, 2 deletions
diff --git a/tmux.h b/tmux.h
index ae1682af..8406955b 100644
--- a/tmux.h
+++ b/tmux.h
@@ -1374,8 +1374,7 @@ struct cmd_entry {
const char *usage;
#define CMD_STARTSERVER 0x1
-#define CMD_CANTNEST 0x2
-#define CMD_READONLY 0x4
+#define CMD_READONLY 0x2
int flags;
enum cmd_retval (*exec)(struct cmd *, struct cmd_q *);
@@ -1868,6 +1867,7 @@ void server_update_socket(void);
void server_add_accept(int);
/* server-client.c */
+int server_client_check_nested(struct client *);
void server_client_handle_key(struct client *, int);
void server_client_create(int);
int server_client_open(struct client *, char **);