From 41863470baec86c45858b4b0e7048400a91986bc Mon Sep 17 00:00:00 2001 From: Tiago Cunha Date: Wed, 28 Oct 2009 22:48:35 +0000 Subject: Sync OpenBSD patchset 446: 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. --- tmux.c | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) (limited to 'tmux.c') diff --git a/tmux.c b/tmux.c index c1450645..801c1cac 100644 --- a/tmux.c +++ b/tmux.c @@ -1,4 +1,4 @@ -/* $Id: tmux.c,v 1.180 2009-10-23 17:40:23 tcunha Exp $ */ +/* $Id: tmux.c,v 1.181 2009-10-28 22:48:35 tcunha Exp $ */ /* * Copyright (c) 2007 Nicholas Marriott @@ -71,7 +71,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); @@ -326,9 +326,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); -- cgit