wmaker: Consistent indenting in WindowMaker.h.

Also shorten clip_merge_in_dock comment to keep line under 115 characters.