> I agree it would make sense to operate on the selected-window rather
 > than pass an explicit window argument.

Please have a look at the attached patch.

martin