mirror of
https://github.com/tmux/tmux.git
synced 2024-12-04 19:58:48 +00:00
Merge branch 'obsd-master'
This commit is contained in:
commit
7b148f7b5b
2
colour.c
2
colour.c
@ -948,7 +948,7 @@ colour_byname(const char *name)
|
|||||||
|
|
||||||
if (strncmp(name, "grey", 4) == 0 || strncmp(name, "gray", 4) == 0) {
|
if (strncmp(name, "grey", 4) == 0 || strncmp(name, "gray", 4) == 0) {
|
||||||
if (name[4] == '\0')
|
if (name[4] == '\0')
|
||||||
return (-1);
|
return (0xbebebe|COLOUR_FLAG_RGB);
|
||||||
c = strtonum(name + 4, 0, 100, &errstr);
|
c = strtonum(name + 4, 0, 100, &errstr);
|
||||||
if (errstr != NULL)
|
if (errstr != NULL)
|
||||||
return (-1);
|
return (-1);
|
||||||
|
4
tmux.c
4
tmux.c
@ -408,9 +408,9 @@ main(int argc, char **argv)
|
|||||||
cfg_files[cfg_nfiles++] = xstrdup(optarg);
|
cfg_files[cfg_nfiles++] = xstrdup(optarg);
|
||||||
cfg_quiet = 0;
|
cfg_quiet = 0;
|
||||||
break;
|
break;
|
||||||
case 'V':
|
case 'V':
|
||||||
printf("tmux %s\n", getversion());
|
printf("tmux %s\n", getversion());
|
||||||
exit(0);
|
exit(0);
|
||||||
case 'l':
|
case 'l':
|
||||||
flags |= CLIENT_LOGIN;
|
flags |= CLIENT_LOGIN;
|
||||||
break;
|
break;
|
||||||
|
Loading…
Reference in New Issue
Block a user