mischief/openbsd-src
1
0
Fork 0
mirror of https://github.com/openbsd/src.git synced 2025-01-10 06:47:55 -08:00
Code

The pane's style should be initialized to default before parsing the

Browse Source 
argument.
This commit is contained in:
nicm 2019-03-13 21:39:21 +00:00
parent e5126d2061
commit 6e770396c8
2 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
usr.bin/tmux/cmd-select-pane.c
View File

@ -1,4 +1,4 @@
/* $OpenBSD: cmd-select-pane.c,v 1.45 2018/10/18 08:38:01 nicm Exp $ */
/* $OpenBSD: cmd-select-pane.c,v 1.46 2019/03/13 21:39:21 nicm Exp $ */
/*
* Copyright (c) 2009 Nicholas Marriott <nicholas.marriott@gmail.com>
@ -19,6 +19,7 @@
#include <sys/types.h>
#include <stdlib.h>
#include <string.h>
#include "tmux.h"
@ -143,6 +144,8 @@ cmd_select_pane_exec(struct cmd *self, struct cmdq_item *item)
if (args_has(self->args, 'P') || args_has(self->args, 'g')) {
if (args_has(args, 'P')) {
style = args_get(args, 'P');
memcpy(&wp->colgc, &grid_default_cell,
sizeof wp->colgc);
if (style_parse(&grid_default_cell, &wp->colgc,
style) == -1) {
cmdq_error(item, "bad style: %s", style);

4
usr.bin/tmux/colour.c
View File

@ -1,4 +1,4 @@
/* $OpenBSD: colour.c,v 1.16 2018/10/25 15:13:38 nicm Exp $ */
/* $OpenBSD: colour.c,v 1.17 2019/03/13 21:39:21 nicm Exp $ */
/*
* Copyright (c) 2008 Nicholas Marriott <nicholas.marriott@gmail.com>
@ -160,7 +160,7 @@ colour_tostring(int c)
case 97:
return ("brightwhite");
}
return (NULL);
return ("invalid");
}
/* Convert colour from string. */