vi: implement missing features from upstream release 8.0