Hello Thorsten, Sorry for the delayed response. On Mon, Jan 25, 2016 at 02:28:22AM +0100, Thorsten Heymann wrote: >Unlike other commands, the current implementation of the 'y' command does >not allow a comment on the same line if the command is not >"terminated" by a ';' That is indeed a bug, and a rather old one. Your suggested fix is correct, but I thought that instead of duplicating the same few lines, it might be better to extract the code to a new function. The attached patch does that and adds a corresponding unit test. Comments welcomed, - assaf