neovim: Update patch to apply against master