From 1f9d76ab6a9c93c8dcb517e61f12aba8511d4e96 Mon Sep 17 00:00:00 2001
From: John Bintz <john@coswellproductions.com>
Date: Sat, 14 May 2011 11:57:10 -0400
Subject: [PATCH] ensure javascript formatting loads if coffeescript syntax
 highlighting is requested by not available

---
 syntax/jasmine.vim | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/syntax/jasmine.vim b/syntax/jasmine.vim
index 1199746..cc344b4 100644
--- a/syntax/jasmine.vim
+++ b/syntax/jasmine.vim
@@ -4,12 +4,14 @@ endif
 
 if &ft =~ "coffee"
   runtime! syntax/coffee.vim
-else
+endif
+
+if !exists("b:current_syntax")
   runtime! syntax/javascript.vim
 endif
 
 syn case match
-syn keyword specFunctions afterEach beforeEach describe it expect addMatchers spyOn not
+syn keyword specFunctions afterEach beforeEach describe it expect addMatchers spyOn not context
 syn keyword specDisabled xit xdescribe
 syn keyword specSpys andCallThrough andReturn andThrow andCallFake callCount argsForCall mostRecentCall
 syn keyword specAsync runs waits waitsFor