Your comments

Would be great, but automatically, without having to type Ctrl-p / Ctrl-n.