Skip to content

Commit

Permalink
Deprecate CoffeeMake for make
Browse files Browse the repository at this point in the history
CoffeeMake ended up just calling make anyway, so simplify things by removing it
  • Loading branch information
kchmck committed Aug 25, 2013
1 parent 46f2dca commit 114dd93
Show file tree
Hide file tree
Showing 2 changed files with 11 additions and 4 deletions.
6 changes: 3 additions & 3 deletions autoload/coffee.vim
Expand Up @@ -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
Expand All @@ -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
Expand Down
9 changes: 8 additions & 1 deletion compiler/coffee.vim
Expand Up @@ -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<bang> <args>
command! -bang -bar -nargs=* CoffeeMake
\ call s:CoffeeMakeDeprecated(<q-bang>, <q-args>)

" Set `makeprg` on rename since we embed the filename in the setting.
augroup CoffeeUpdateMakePrg
Expand Down

0 comments on commit 114dd93

Please sign in to comment.