===================================================================
RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/tmux/tmux.c,v
retrieving revision 1.203
retrieving revision 1.204
diff -u -r1.203 -r1.204
--- src/usr.bin/tmux/tmux.c	2020/09/22 05:23:34	1.203
+++ src/usr.bin/tmux/tmux.c	2021/01/17 16:17:41	1.204
@@ -1,4 +1,4 @@
-/* $OpenBSD: tmux.c,v 1.203 2020/09/22 05:23:34 nicm Exp $ */
+/* $OpenBSD: tmux.c,v 1.204 2021/01/17 16:17:41 nicm Exp $ */
 
 /*
  * Copyright (c) 2007 Nicholas Marriott <nicholas.marriott@gmail.com>
@@ -57,7 +57,7 @@
 usage(void)
 {
 	fprintf(stderr,
-	    "usage: %s [-2CDluvV] [-c shell-command] [-f file] [-L socket-name]\n"
+	    "usage: %s [-2CDlNuvV] [-c shell-command] [-f file] [-L socket-name]\n"
 	    "            [-S socket-path] [-T features] [command [flags]]\n",
 	    getprogname());
 	exit(1);
@@ -350,7 +350,7 @@
 	if (**argv == '-')
 		flags = CLIENT_LOGIN;
 
-	while ((opt = getopt(argc, argv, "2c:CDdf:lL:qS:T:uUvV")) != -1) {
+	while ((opt = getopt(argc, argv, "2c:CDdf:lL:NqS:T:uUvV")) != -1) {
 		switch (opt) {
 		case '2':
 			tty_add_features(&feat, "256", ":,");
@@ -379,6 +379,9 @@
 		case 'L':
 			free(label);
 			label = xstrdup(optarg);
+			break;
+		case 'N':
+			flags |= CLIENT_NOSTARTSERVER;
 			break;
 		case 'q':
 			break;