From 8f7982e06e409fdafb64c71c5e179366612043d4 Mon Sep 17 00:00:00 2001 From: Tim Pope Date: Mon, 8 May 2017 16:34:21 -0400 Subject: [PATCH] Sync with upstream --- ftplugin/haml.vim | 3 ++- ftplugin/sass.vim | 2 +- ftplugin/scss.vim | 2 +- indent/haml.vim | 2 +- indent/sass.vim | 2 +- syntax/haml.vim | 2 +- syntax/sass.vim | 2 +- 7 files changed, 8 insertions(+), 7 deletions(-) diff --git a/ftplugin/haml.vim b/ftplugin/haml.vim index 8c693fa..e74530b 100644 --- a/ftplugin/haml.vim +++ b/ftplugin/haml.vim @@ -1,7 +1,7 @@ " Vim filetype plugin " Language: Haml " Maintainer: Tim Pope -" Last Change: 2010 May 21 +" Last Change: 2016 Aug 29 " Only do this when not done yet for this buffer if exists("b:did_ftplugin") @@ -64,5 +64,6 @@ let b:undo_ftplugin = "setl cms< com< " \ " | unlet! b:browsefilter b:match_words | " . s:undo_ftplugin let &cpo = s:save_cpo +unlet s:save_cpo " vim:set sw=2: diff --git a/ftplugin/sass.vim b/ftplugin/sass.vim index 27c87ad..d6909e7 100644 --- a/ftplugin/sass.vim +++ b/ftplugin/sass.vim @@ -1,7 +1,7 @@ " Vim filetype plugin " Language: Sass " Maintainer: Tim Pope -" Last Change: 2010 Jul 26 +" Last Change: 2016 Aug 29 " Only do this when not done yet for this buffer if exists("b:did_ftplugin") diff --git a/ftplugin/scss.vim b/ftplugin/scss.vim index 2e3c5f1..287d298 100644 --- a/ftplugin/scss.vim +++ b/ftplugin/scss.vim @@ -1,7 +1,7 @@ " Vim filetype plugin " Language: SCSS " Maintainer: Tim Pope -" Last Change: 2010 Jul 26 +" Last Change: 2016 Aug 29 if exists("b:did_ftplugin") finish diff --git a/indent/haml.vim b/indent/haml.vim index cfd30f1..c3935af 100644 --- a/indent/haml.vim +++ b/indent/haml.vim @@ -1,7 +1,7 @@ " Vim indent file " Language: Haml " Maintainer: Tim Pope -" Last Change: 2010 May 21 +" Last Change: 2016 Aug 29 if exists("b:did_indent") finish diff --git a/indent/sass.vim b/indent/sass.vim index d2e7a9a..d87b371 100644 --- a/indent/sass.vim +++ b/indent/sass.vim @@ -1,7 +1,7 @@ " Vim indent file " Language: Sass " Maintainer: Tim Pope -" Last Change: 2010 May 21 +" Last Change: 2016 Aug 29 if exists("b:did_indent") finish diff --git a/syntax/haml.vim b/syntax/haml.vim index 4cc54ca..5369695 100644 --- a/syntax/haml.vim +++ b/syntax/haml.vim @@ -2,7 +2,7 @@ " Language: Haml " Maintainer: Tim Pope " Filenames: *.haml -" Last Change: 2010 Aug 09 +" Last Change: 2016 Aug 29 if exists("b:current_syntax") finish diff --git a/syntax/sass.vim b/syntax/sass.vim index 8fec5d0..d075c87 100644 --- a/syntax/sass.vim +++ b/syntax/sass.vim @@ -2,7 +2,7 @@ " Language: Sass " Maintainer: Tim Pope " Filenames: *.sass -" Last Change: 2010 Aug 09 +" Last Change: 2016 Aug 29 if exists("b:current_syntax") finish