term-getchar: Merge the 'nowait and the 'wait version into
a single (term-getchar) function.