Merge branch 'rewatch2'

lib/coffee-script/command.js

@@ -195,23 +195,19 @@
   };
 
   watch = function(source, base) {
-    var compile, compileTimeout, prevStats, rewatch, rewatchTimeout, watchErr, watcher;
+    var compile, compileTimeout, prevStats, rewatch, watchErr, watcher;
     prevStats = null;
     compileTimeout = null;
-    rewatchTimeout = null;
     watchErr = function(e) {
       if (e.code === 'ENOENT') {
         if (sources.indexOf(source) === -1) return;
-        clearTimeout(rewatchTimeout);
-        return rewatchTimeout = wait(25, function() {
-          try {
-            rewatch();
-            return compile();
-          } catch (e) {
-            removeSource(source, base, true);
-            return compileJoin();
-          }
-        });
+        try {
+          rewatch();
+          return compile();
+        } catch (e) {
+          removeSource(source, base, true);
+          return compileJoin();
+        }
       } else {
         throw e;
       }

src/command.coffee

@@ -174,19 +174,16 @@ watch = (source, base) ->
 
   prevStats = null
   compileTimeout = null
-  rewatchTimeout = null
 
   watchErr = (e) ->
     if e.code is 'ENOENT'
       return if sources.indexOf(source) is -1
-      clearTimeout rewatchTimeout
-      rewatchTimeout = wait 25, ->
-        try
-          rewatch()
-          compile()
-        catch e
-          removeSource source, base, yes
-          compileJoin()
+      try
+        rewatch()
+        compile()
+      catch e
+        removeSource source, base, yes
+        compileJoin()
     else throw e
 
   rewatch = ->