Sync OpenBSD patchset 303:

Sort cases same as getopt argument, from martynas.
pull/1/head
Tiago Cunha 2009-09-02 00:54:00 +00:00
parent d463eddb8b
commit 99de03ea32
1 changed files with 7 additions and 7 deletions

14
tmux.c
View File

@ -1,4 +1,4 @@
/* $Id: tmux.c,v 1.165 2009-08-31 22:30:15 tcunha Exp $ */ /* $Id: tmux.c,v 1.166 2009-09-02 00:54:00 tcunha Exp $ */
/* /*
* Copyright (c) 2007 Nicholas Marriott <nicm@users.sourceforge.net> * Copyright (c) 2007 Nicholas Marriott <nicm@users.sourceforge.net>
@ -289,6 +289,9 @@ main(int argc, char **argv)
flags |= IDENTIFY_88COLOURS; flags |= IDENTIFY_88COLOURS;
flags &= ~IDENTIFY_256COLOURS; flags &= ~IDENTIFY_256COLOURS;
break; break;
case 'd':
flags |= IDENTIFY_HASDEFAULTS;
break;
case 'f': case 'f':
if (cfg_file) if (cfg_file)
xfree(cfg_file); xfree(cfg_file);
@ -299,23 +302,20 @@ main(int argc, char **argv)
xfree(label); xfree(label);
label = xstrdup(optarg); label = xstrdup(optarg);
break; break;
case 'q':
be_quiet = 1;
break;
case 'S': case 'S':
if (path != NULL) if (path != NULL)
xfree(path); xfree(path);
path = xstrdup(optarg); path = xstrdup(optarg);
break; break;
case 'q':
be_quiet = 1;
break;
case 'u': case 'u':
flags |= IDENTIFY_UTF8; flags |= IDENTIFY_UTF8;
break; break;
case 'U': case 'U':
unlock = 1; unlock = 1;
break; break;
case 'd':
flags |= IDENTIFY_HASDEFAULTS;
break;
case 'v': case 'v':
debug_level++; debug_level++;
break; break;