misc/vim: more private fixes.
misc/vim: more private fixes.

mrjbq7/factor,factor/factor,factor/factor,mrjbq7/factor,tgunr/factor,mrjbq7/factor,tgunr/factor,mrjbq7/factor,factor/factor,tgunr/factor,mrjbq7/factor,factor/factor,factor/factor,tgunr/factor,tgunr/factor,mrjbq7/factor,factor/factor,tgunr/factor