Merge branch 'master' into api/docs

src/app/editor.coffee

@@ -1057,11 +1057,11 @@ class Editor extends View
 
   remove: (selector, keepData) ->
     return super if keepData or @removed
-    @trigger 'editor:will-be-removed'
     super
     rootView?.focus()
 
   beforeRemove: ->
+    @trigger 'editor:will-be-removed'
     @removed = true
     @activeEditSession?.destroy()
     $(window).off(".editor-#{@id}")

src/app/pane.coffee

@@ -166,7 +166,7 @@ class Pane extends View
     uri = item.getUri()
     atom.confirm(
       "'#{item.getTitle?() ? item.getUri()}' has changes, do you want to save them?"
-      "Your changes will be lost if close this item without saving."
+      "Your changes will be lost if you close this item without saving."
       "Save", => @saveItem(item, nextAction)
       "Cancel", cancelAction
       "Don't Save", nextAction

src/app/project.coffee

@@ -290,7 +290,7 @@ class Project
         readLine(line) if state is 'readingLines'
 
     command = require.resolve('nak')
-    args = ['--ackmate', regex.source, @getPath()]
+    args = ['--hidden', '--ackmate', regex.source, @getPath()]
     args.unshift("--addVCSIgnores") if config.get('core.excludeVcsIgnoredPaths')
     new BufferedProcess({command, args, stdout, exit})
     deferred

src/app/select-list.coffee

@@ -32,9 +32,11 @@ class SelectList extends View
     @on 'core:move-to-top', =>
       @selectItem(@list.find('li:first'))
       @list.scrollToTop()
+      false
     @on 'core:move-to-bottom', =>
       @selectItem(@list.find('li:last'))
       @list.scrollToBottom()
+      false
     @on 'core:confirm', => @confirmSelection()
     @on 'core:cancel', => @cancel()
 

src/app/window.coffee

@@ -164,13 +164,11 @@ window.reload = ->
   timesReloaded = process.global.timesReloaded ? 0
   ++timesReloaded
 
-  restartValue = if window.location.search.indexOf('spec-bootstrap') == -1 then 10 else 3
-
-  if timesReloaded > restartValue
+  if timesReloaded > 3
     atom.restartRendererProcess()
   else
-    $native.reload()
     process.global.timesReloaded = timesReloaded
+    $native.reload()
 
 window.onerror = ->
   atom.showDevTools()