diff options
| author | Nicholas Marriott <nicm@cvs.openbsd.org> | 2009-06-25 06:40:26 +0000 |
|---|---|---|
| committer | Nicholas Marriott <nicm@cvs.openbsd.org> | 2009-06-25 06:40:26 +0000 |
| commit | 998b85f3b81f72bcbb4796f491ba0a37baa190d4 (patch) | |
| tree | 574576412e5a182ec11707c3d4b4765b5838b5a9 /usr.bin | |
| parent | 56edf9294d375808faecec4810d0f66a9d74b903 (diff) | |
Remove error about using -L and -S together which was never displayed as
logging wasn't yet enabled, was unnecessary, and contradicted the man page
which says using -S will cause -L to be ignored.
Diffstat (limited to 'usr.bin')
| -rw-r--r-- | usr.bin/tmux/tmux.c | 10 |
1 files changed, 1 insertions, 9 deletions
diff --git a/usr.bin/tmux/tmux.c b/usr.bin/tmux/tmux.c index 671b6999c91..b2466d034f8 100644 --- a/usr.bin/tmux/tmux.c +++ b/usr.bin/tmux/tmux.c @@ -1,4 +1,4 @@ -/* $OpenBSD: tmux.c,v 1.9 2009/06/23 18:27:40 nicm Exp $ */ +/* $OpenBSD: tmux.c,v 1.10 2009/06/25 06:40:25 nicm Exp $ */ /* * Copyright (c) 2007 Nicholas Marriott <nicm@users.sourceforge.net> @@ -233,19 +233,11 @@ main(int argc, char **argv) cfg_file = xstrdup(optarg); break; case 'L': - if (path != NULL) { - log_warnx("-L and -S cannot be used together"); - exit(1); - } if (label != NULL) xfree(label); label = xstrdup(optarg); break; case 'S': - if (label != NULL) { - log_warnx("-L and -S cannot be used together"); - exit(1); - } if (path != NULL) xfree(path); path = xstrdup(optarg); |