diff options
| author | Thomas Adam <thomas@xteddy.org> | 2021-01-17 18:01:21 +0000 |
|---|---|---|
| committer | Thomas Adam <thomas@xteddy.org> | 2021-01-17 18:01:21 +0000 |
| commit | 24c15eda793022f834fc28079f95ca71e2e2215c (patch) | |
| tree | 48a01f6cbdc6680f52c7880aacc1c6b3d65b76f0 /tmux.c | |
| parent | d4866d5fe6214064882244ddb32f05480e9d8d91 (diff) | |
| parent | 71c590a37f98d82c72279eddae74f9b8be146202 (diff) | |
| download | rtmux-24c15eda793022f834fc28079f95ca71e2e2215c.tar.gz rtmux-24c15eda793022f834fc28079f95ca71e2e2215c.tar.bz2 rtmux-24c15eda793022f834fc28079f95ca71e2e2215c.zip | |
Merge branch 'obsd-master' into master
Diffstat (limited to 'tmux.c')
| -rw-r--r-- | tmux.c | 7 |
1 files changed, 5 insertions, 2 deletions
@@ -53,7 +53,7 @@ static __dead void 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); @@ -340,7 +340,7 @@ main(int argc, char **argv) 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", ":,"); @@ -370,6 +370,9 @@ main(int argc, char **argv) free(label); label = xstrdup(optarg); break; + case 'N': + flags |= CLIENT_NOSTARTSERVER; + break; case 'q': break; case 'S': |