Merge branch 'master' of https://github.com/github/atom

native/v8_extensions/native.mm

@@ -117,7 +117,7 @@ bool Native::Execute(const CefString& name,
       if (entry->fts_level == 0) {
         continue;
       }
-      
+
       bool isFile = entry->fts_info == FTS_NSOK;
       bool isDir =  entry->fts_info == FTS_D;
       if (!isFile && !isDir) {

native/v8_extensions/onig_scanner.mm

@@ -56,7 +56,7 @@ class OnigScannerUserData : public CefBase {
 
       bool useCachedResult = false;
       OnigResult *result = NULL;
-      
+
       // In Oniguruma, \G is based on the start position of the match, so the result
       // changes based on the start position. So it can't be cached.
       BOOL containsBackslashG = [regExp.expression rangeOfString:@"\\G"].location != NSNotFound;

src/extensions/outline-view/index.coffee

@@ -1 +1 @@
-module.exports = require 'outline-view/outline-view'
+module.exports = require 'outline-view/src/outline-view'

src/extensions/outline-view/spec/outline-view-spec.coffee

@@ -1,6 +1,6 @@
 RootView = require 'root-view'
 OutlineView = require 'outline-view'
-TagGenerator = require 'outline-view/tag-generator'
+TagGenerator = require 'outline-view/src/tag-generator'
 
 describe "OutlineView", ->
   [rootView, outlineView] = []

src/extensions/outline-view/src/outline-view.coffee

@@ -1,14 +1,14 @@
 {View, $$} = require 'space-pen'
 SelectList = require 'select-list'
 Editor = require 'editor'
-TagGenerator = require 'outline-view/tag-generator'
+TagGenerator = require 'outline-view/src/tag-generator'
 
 module.exports =
 class OutlineView extends SelectList
 
   @activate: (rootView) ->
     requireStylesheet 'select-list.css'
-    requireStylesheet 'outline-view/outline-view.css'
+    requireStylesheet 'outline-view/src/outline-view.css'
     @instance = new OutlineView(rootView)
     rootView.command 'outline-view:toggle', => @instance.toggle()
 

src/extensions/outline-view/src/tag-generator.coffee

@@ -43,5 +43,5 @@ class TagGenerator
         for line in lines
           tag = @parseTagLine(line)
           @callback(tag) if tag
-    command = "ctags --fields=+KS -nf - #{@path}"
+    command = "#{require.resolve('ctags')} --fields=+KS -nf - #{@path}"
     ChildProcess.exec(command, options)