MacVim devel snapshot 69

Closes #21524.

Signed-off-by: Adam Vandenberg <flangy@gmail.com>