From 4af1321588c7dcb718022226cb27ec325973c2f0 Mon Sep 17 00:00:00 2001 From: Adam Stankiewicz Date: Mon, 2 Nov 2020 18:48:34 +0100 Subject: Revert "Rename cpo_save variable to prevent conflicts, fixes #619" This reverts commit d96f11bcd81231af1540e164152bfba11002bee9. --- ftdetect/polyglot.vim | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/ftdetect/polyglot.vim b/ftdetect/polyglot.vim index 72d938e8..edfba1d7 100644 --- a/ftdetect/polyglot.vim +++ b/ftdetect/polyglot.vim @@ -11,7 +11,7 @@ endif let did_load_polyglot = 1 " Switch to compatible mode for the time being -let s:polyglot_cpo_save = &cpo +let s:cpo_save = &cpo set cpo&vim " It can happen vim filetype.vim loads first, then we need a reset @@ -3565,5 +3565,5 @@ if !has_key(g:polyglot_is_disabled, 'sensible') endif " Restore 'cpoptions' -let &cpo = s:polyglot_cpo_save -unlet s:polyglot_cpo_save +let &cpo = s:cpo_save +unlet s:cpo_save -- cgit v1.2.3