Buffer may be NULL.  Closes #358
Re-enable [n] [#] and [*].  Closes #354.

This code was deleted during the change to cursors.