summaryrefslogtreecommitdiff
path: root/usr.bin/tmux/tmux.c
diff options
context:
space:
mode:
authorNicholas Marriott <nicm@cvs.openbsd.org>2009-10-25 21:11:22 +0000
committerNicholas Marriott <nicm@cvs.openbsd.org>2009-10-25 21:11:22 +0000
commit95f341381dcddefb851a3d8a07461a8a37c4df72 (patch)
treee525bc8c517fb970fd881c18506229e2c1877b5d /usr.bin/tmux/tmux.c
parenta9f0985ce71f7768c83b39c36b1ad103dbc112a7 (diff)
Remove the -d flag to tmux and just use op/AX to detect default colours.
Irritatingly, although op can be used to tell if a terminal supports default colours, it can't be used to set them because in some terminfo descriptions it resets attributes as a side-effect (acts as sgr0) and in others it doesn't, so it is not possible to determine reliably what the terminal state will be afterwards. So if AX is missing and op is present, tmux just sends sgr0. Anyone using -d for a terminal who finds they actually needed it can replace it using terminal-overrides, but please let me know as it is probably an omission from terminfo.
Diffstat (limited to 'usr.bin/tmux/tmux.c')
-rw-r--r--usr.bin/tmux/tmux.c7
1 files changed, 2 insertions, 5 deletions
diff --git a/usr.bin/tmux/tmux.c b/usr.bin/tmux/tmux.c
index fe9fc0aad0c..bba33d99dd6 100644
--- a/usr.bin/tmux/tmux.c
+++ b/usr.bin/tmux/tmux.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: tmux.c,v 1.51 2009/10/22 10:04:07 nicm Exp $ */
+/* $OpenBSD: tmux.c,v 1.52 2009/10/25 21:11:21 nicm Exp $ */
/*
* Copyright (c) 2007 Nicholas Marriott <nicm@users.sourceforge.net>
@@ -62,7 +62,7 @@ __dead void
usage(void)
{
fprintf(stderr,
- "usage: %s [-28dlquv] [-c shell-command] [-f file] [-L socket-name]\n"
+ "usage: %s [-28lquv] [-c shell-command] [-f file] [-L socket-name]\n"
" [-S socket-path] [command [flags]]\n",
__progname);
exit(1);
@@ -317,9 +317,6 @@ main(int argc, char **argv)
xfree(shellcmd);
shellcmd = xstrdup(optarg);
break;
- case 'd':
- flags |= IDENTIFY_HASDEFAULTS;
- break;
case 'f':
if (cfg_file != NULL)
xfree(cfg_file);