Screen cleanup and diff options for vi