Style nits - return (x) not return x.
Rather than having two grids for each pane, one for ASCII and one for
UTF-8, collapse the two together. Simplifies the code at the expense of
more memory (which can probably be reduced again later).
Merge branch 'obsd-master'

Conflicts:
	Makefile
	grid-utf8.c
Add -Wdeclaration-after-statement.