Update -SRin, fix Vim under fish