From 114dd9365a98ffecf2259012aec298b1603427ad Mon Sep 17 00:00:00 2001 From: Mick Koch Date: Sun, 25 Aug 2013 13:57:56 -0400 Subject: [PATCH] Deprecate CoffeeMake for make CoffeeMake ended up just calling make anyway, so simplify things by removing it --- autoload/coffee.vim | 6 +++--- compiler/coffee.vim | 9 ++++++++- 2 files changed, 11 insertions(+), 4 deletions(-) diff --git a/autoload/coffee.vim b/autoload/coffee.vim index 4b464ce..04d5efb 100644 --- a/autoload/coffee.vim +++ b/autoload/coffee.vim @@ -5,12 +5,12 @@ " Set up some common global/buffer variables. function! coffee#CoffeeSetUpVariables() - " Path to coffee compiler (used by CoffeeMake and CoffeeCompile) + " Path to coffee executable if !exists('g:coffee_compiler') let g:coffee_compiler = 'coffee' endif - " Extra options passed to CoffeeMake + " Options passed to coffee with make if !exists('g:coffee_make_options') let g:coffee_make_options = '' endif @@ -25,7 +25,7 @@ function! coffee#CoffeeSetUpVariables() let g:coffee_cake_options = '' endif - " Path to coffeelint executable (used by CoffeeLint) + " Path to coffeelint executable if !exists('g:coffee_linter') let g:coffee_linter = 'coffeelint' endif diff --git a/compiler/coffee.vim b/compiler/coffee.vim index 6c350dd..f521ca9 100644 --- a/compiler/coffee.vim +++ b/compiler/coffee.vim @@ -50,9 +50,16 @@ exec 'CompilerSet makeprg=' . current_compiler call s:SetMakePrg() call coffee#CoffeeSetUpErrorFormat() +function! s:CoffeeMakeDeprecated(bang, args) + echoerr 'CoffeeMake is deprecated! Please use :make instead, its behavior ' . + \ 'is identical.' + sleep 5 + exec 'make' . a:bang a:args +endfunction " Compile the current file. -command! -bang -bar -nargs=* CoffeeMake make +command! -bang -bar -nargs=* CoffeeMake +\ call s:CoffeeMakeDeprecated(, ) " Set `makeprg` on rename since we embed the filename in the setting. augroup CoffeeUpdateMakePrg