Merge pull request #9 from jvortmann/jasmine.vim

--- This commit properly detects the Spec files for *[Ss]pec.js and *[Ss]pec.coffee
claco · Feb 15, 2012 · a9c1dd8 · a9c1dd8
2 parents 829e0ed + 0903ef4
commit a9c1dd8
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 5 deletions.
diff --git a/ftdetect/jasmine.vim b/ftdetect/jasmine.vim
@@ -1,2 +1,2 @@
-autocmd BufNewFile,BufRead,BufWritePost *_[Ss]pec.js,*SpecHelper.js set filetype=jasmine.javascript syntax=jasmine
-autocmd BufNewFile,BufRead,BufWritePost *_[Ss]pec.coffee,*SpecHelper.coffee set filetype=jasmine.coffee syntax=jasmine
+autocmd BufNewFile,BufRead,BufWritePost *[Ss]pec.js,*SpecHelper.js set filetype=jasmine.javascript syntax=jasmine
+autocmd BufNewFile,BufRead,BufWritePost *[Ss]pec.coffee,*SpecHelper.coffee set filetype=jasmine.coffee syntax=jasmine
diff --git a/syntax/jasmine.vim b/syntax/jasmine.vim
@@ -4,9 +4,7 @@ endif
 
 if &ft =~ "coffee"
   runtime! syntax/coffee.vim
-endif
-
-if !exists("b:current_syntax")
+else
   runtime! syntax/javascript.vim
 endif