Merge branch 'obsd-master'

Conflicts:
	Makefile
	grid-utf8.c
This commit is contained in:
Thomas Adam
2013-01-30 15:27:19 +00:00
14 changed files with 198 additions and 444 deletions

View File

@ -879,8 +879,8 @@ input_clear(struct input_ctx *ictx)
int
input_print(struct input_ctx *ictx)
{
ictx->cell.data = ictx->ch;
screen_write_cell(&ictx->ctx, &ictx->cell, NULL);
grid_cell_one(&ictx->cell, ictx->ch);
screen_write_cell(&ictx->ctx, &ictx->cell);
return (0);
}
@ -1657,9 +1657,8 @@ input_utf8_close(struct input_ctx *ictx)
utf8_append(&ictx->utf8data, ictx->ch);
ictx->cell.flags |= GRID_FLAG_UTF8;
screen_write_cell(&ictx->ctx, &ictx->cell, &ictx->utf8data);
ictx->cell.flags &= ~GRID_FLAG_UTF8;
grid_cell_set(&ictx->cell, &ictx->utf8data);
screen_write_cell(&ictx->ctx, &ictx->cell);
return (0);
}