Don't set line height on mini editors

Upgrade to atom-shell@0.11.3

atom.sh

@@ -66,14 +66,17 @@ if [ $OS == 'Mac' ]; then
     open -a "$ATOM_PATH/$ATOM_APP_NAME" -n --args --executed-from="$(pwd)" --pid=$$ "$@"
   fi
 elif [ $OS == 'Linux' ]; then
-  ATOM_PATH='/opt/Atom/atom'
+  SCRIPT=`readlink -f "$0"`
+  USR_DIRECTORY=`readlink -f $(dirname $SCRIPT)/..`
+  ATOM_PATH="$USR_DIRECTORY/share/atom/atom"
+
   [ -x "$ATOM_PATH" ] || ATOM_PATH='/tmp/atom-build/Atom/atom'
 
   if [ $EXPECT_OUTPUT ]; then
     "$ATOM_PATH" --executed-from="$(pwd)" --pid=$$ "$@"
     exit $?
   else
-    nohup "$ATOM_PATH" --executed-from="$(pwd)" --pid=$$ "$@" > /dev/null &
+    nohup "$ATOM_PATH" --executed-from="$(pwd)" --pid=$$ "$@" > /dev/null 2>&1 &
   fi
 fi
 

build/Gruntfile.coffee

@@ -39,35 +39,33 @@ module.exports = (grunt) ->
   if process.platform is 'win32'
     appName = 'Atom'
     tmpDir = os.tmpdir()
-    installRoot = process.env.ProgramFiles
     buildDir = grunt.option('build-dir') ? path.join(tmpDir, 'atom-build')
     symbolsDir = path.join(buildDir, 'Atom.breakpad.syms')
     shellAppDir = path.join(buildDir, appName)
     contentsDir = shellAppDir
     appDir = path.join(shellAppDir, 'resources', 'app')
     atomShellDownloadDir = path.join(os.tmpdir(), 'atom-cached-atom-shells')
+    installDir = path.join(process.env.ProgramFiles, appName)
   else if process.platform is 'darwin'
     appName = 'Atom.app'
     tmpDir = '/tmp'
-    installRoot = '/Applications'
     buildDir = grunt.option('build-dir') ? path.join(tmpDir, 'atom-build')
     symbolsDir = path.join(buildDir, 'Atom.breakpad.syms')
     shellAppDir = path.join(buildDir, appName)
     contentsDir = path.join(shellAppDir, 'Contents')
     appDir = path.join(contentsDir, 'Resources', 'app')
     atomShellDownloadDir = '/tmp/atom-cached-atom-shells'
+    installDir = path.join('/Applications', appName)
   else
     appName = 'Atom'
     tmpDir = '/tmp'
-    installRoot = '/opt'
     buildDir = grunt.option('build-dir') ? path.join(tmpDir, 'atom-build')
     symbolsDir = path.join(buildDir, 'Atom.breakpad.syms')
     shellAppDir = path.join(buildDir, appName)
     contentsDir = shellAppDir
     appDir = path.join(shellAppDir, 'resources', 'app')
     atomShellDownloadDir = '/tmp/atom-cached-atom-shells'
-
-  installDir = path.join(installRoot, appName)
+    installDir = process.env.INSTALL_PREFIX ? '/usr/local'
 
   coffeeConfig =
     options:

build/tasks/install-task.coffee

@@ -15,7 +15,16 @@ module.exports = (grunt) ->
 
       createShortcut = path.resolve 'script', 'create-shortcut.cmd'
       runas('cmd', ['/c', createShortcut, path.join(installDir, 'atom.exe'), 'Atom'])
-    else
+    else if process.platform is 'darwin'
       rm installDir
       mkdir path.dirname(installDir)
       cp shellAppDir, installDir
+    else
+      binDir = path.join(installDir, 'bin')
+      shareDir = path.join(installDir, 'share', 'atom')
+
+      mkdir binDir
+      cp 'atom.sh', path.join(binDir, 'atom')
+      rm shareDir
+      mkdir path.dirname(shareDir)
+      cp shellAppDir, shareDir

build/tasks/mkdeb-task.coffee

@@ -0,0 +1,31 @@
+fs = require 'fs'
+path = require 'path'
+_ = require 'underscore-plus'
+
+fillTemplate = (filePath, data) ->
+  template = _.template(String(fs.readFileSync(filePath + '.in')))
+  filled = template(data)
+  fs.writeFileSync(filePath, filled)
+
+module.exports = (grunt) ->
+  {spawn} = require('./task-helpers')(grunt)
+
+  grunt.registerTask 'mkdeb', 'Create debian package', ->
+    done = @async()
+
+    {name, version, description} = grunt.file.readJSON('package.json')
+    section = 'devel'
+    arch = 'amd64'
+    maintainer = 'GitHub <support@github.com>'
+    data = {name, version, description, section, arch, maintainer}
+
+    control = path.join('resources', 'linux', 'debian', 'control')
+    fillTemplate(control, data)
+    desktop = path.join('resources', 'linux', 'Atom.desktop')
+    fillTemplate(desktop, data)
+    icon = path.join('resources', 'atom.png')
+    buildDir = grunt.config.get('atom.buildDir')
+
+    cmd = path.join('script', 'mkdeb')
+    args = [version, control, desktop, icon, buildDir]
+    spawn({cmd, args}, done)

docs/advanced/serialization.md

@@ -19,7 +19,7 @@ module.exports =
   activate: (state) ->
     @myObject =
       if state
-        deserialize(state)
+        atom.deserializers.deserialize(state)
       else
         new MyObject("Hello")
 
@@ -31,7 +31,8 @@ module.exports =
 
 ```coffee-script
 class MyObject
-  registerDeserializer(this)
+  atom.deserializers.add(this)
+
   @deserialize: ({data}) -> new MyObject(data)
   constructor: (@data) ->
   serialize: -> { deserializer: 'MyObject', data: @data }
@@ -50,8 +51,8 @@ class-level method on the same class that implements `serialize`. This method's
 job is to convert a state object returned from a previous call `serialize` back
 into a genuine object.
 
-#### registerDeserializer(klass)
-You need to call the global `registerDeserializer` method with your class in
+#### atom.deserializers.add(klass)
+You need to call the `atom.deserializers.add` method with your class in
 order to make it available to the deserialization system. Now you can call the
 global `deserialize` method with state returned from `serialize`, and your
 class's `deserialize` method will be selected automatically.
@@ -60,14 +61,15 @@ class's `deserialize` method will be selected automatically.
 
 ```coffee-script
 class MyObject
+  atom.deserializers.add(this)
+
   @version: 2
   @deserialize: (state) -> ...
-  serialize: -> { version: MyObject.version, ... }
+  serialize: -> { version: @constructor.version, ... }
 ```
 
 Your serializable class can optionally have a class-level `@version` property
 and include a `version` key in its serialized state. When deserializing, Atom
 will only attempt to call deserialize if the two versions match, and otherwise
 return undefined. We plan on implementing a migration system in the future, but
-this at least protects you from improperly deserializing old state. If you find
-yourself in dire need of the migration system, let us know.
+this at least protects you from improperly deserializing old state.

docs/creating-a-theme.md

@@ -51,7 +51,7 @@ editor such as comments, strings and the line numbers in the gutter.
 
 As an example, let's make the `.gutter` `background-color` into `@red`.
 
-Reload Atom by pressing `cmd-alt-option-L` to see the changes you made reflected
+Reload Atom by pressing `cmd-alt-ctrl-l` to see the changes you made reflected
 in your Atom window. Pretty neat!
 
 __Tip:__ You can avoid reloading to see changes you make by opening an atom

package.json

@@ -1,7 +1,8 @@
 {
   "name": "atom",
   "productName": "Atom",
-  "version": "0.75.0",
+  "version": "0.78.0",
+  "description": "A hackable text editor for the 21st Century.",
   "main": "./src/browser/main.js",
   "repository": {
     "type": "git",
@@ -11,21 +12,21 @@
     "url": "https://github.com/atom/atom/issues"
   },
   "license": "All Rights Reserved",
-  "atomShellVersion": "0.11.1",
+  "atomShellVersion": "0.11.3",
   "dependencies": {
     "async": "0.2.6",
-    "atom-keymap": "^0.9.0",
+    "atom-keymap": "^0.11.0",
     "bootstrap": "git://github.com/atom/bootstrap.git#6af81906189f1747fd6c93479e3d998ebe041372",
     "clear-cut": "0.4.0",
     "coffee-script": "1.7.0",
     "coffeestack": "0.7.0",
     "delegato": "1.x",
-    "emissary": "1.x",
+    "emissary": "^1.2",
     "first-mate": ">=1.4.2 <2.0",
     "fs-plus": ">=2.0.4 < 3.0",
     "fstream": "0.1.24",
     "fuzzaldrin": "~1.1",
-    "git-utils": "^1.0.1",
+    "git-utils": "^1.1.1",
     "guid": "0.0.10",
     "jasmine-tagged": ">=1.1.1 <2.0",
     "mkdirp": "0.3.5",
@@ -33,9 +34,9 @@
     "less-cache": "0.12.0",
     "mixto": "1.x",
     "nslog": "0.5.0",
-    "oniguruma": ">=1.0.3 <2.0",
+    "oniguruma": "^1.0.4",
     "optimist": "0.4.0",
-    "pathwatcher": "^1.0.0",
+    "pathwatcher": "^1.1",
     "property-accessors": "1.x",
     "q": "^1.0.1",
     "random-words": "0.0.1",
@@ -47,20 +48,20 @@
     "serializable": "1.x",
     "space-pen": "3.1.1",
     "temp": "0.5.0",
-    "text-buffer": "^1.4.4",
+    "text-buffer": "^1.4.5",
     "theorist": "1.x",
     "underscore-plus": ">=1.0.5 <2.0",
     "vm-compatibility-layer": "0.1.0"
   },
   "packageDependencies": {
     "atom-dark-syntax": "0.15.0",
-    "atom-dark-ui": "0.25.0",
+    "atom-dark-ui": "0.26.0",
     "atom-light-syntax": "0.16.0",
     "atom-light-ui": "0.23.0",
     "base16-tomorrow-dark-theme": "0.13.0",
     "solarized-dark-syntax": "0.14.0",
     "solarized-light-syntax": "0.7.0",
-    "archive-view": "0.29.0",
+    "archive-view": "0.30.0",
     "autocomplete": "0.27.0",
     "autoflow": "0.15.0",
     "autosave": "0.13.0",
@@ -68,7 +69,7 @@
     "bookmarks": "0.22.0",
     "bracket-matcher": "0.26.0",
     "command-palette": "0.19.0",
-    "dev-live-reload": "0.29.0",
+    "dev-live-reload": "0.30.0",
     "exception-reporting": "0.17.0",
     "feedback": "0.28.0",
     "find-and-replace": "0.92.0",
@@ -77,19 +78,19 @@
     "go-to-line": "0.18.0",
     "grammar-selector": "0.23.0",
     "image-view": "0.32.0",
-    "keybinding-resolver": "0.11.0",
+    "keybinding-resolver": "0.12.0",
     "link": "0.20.0",
-    "markdown-preview": "0.49.0",
+    "markdown-preview": "0.51.0",
     "metrics": "0.32.0",
     "open-on-github": "0.23.0",
     "package-generator": "0.30.0",
     "release-notes": "0.26.0",
     "settings-view": "0.97.0",
-    "snippets": "0.37.0",
+    "snippets": "0.40.0",
     "spell-check": "0.28.0",
-    "status-bar": "0.36.0",
+    "status-bar": "0.37.0",
     "styleguide": "0.26.0",
-    "symbols-view": "0.44.0",
+    "symbols-view": "0.46.0",
     "tabs": "0.31.0",
     "timecop": "0.17.0",
     "tree-view": "0.83.0",
@@ -100,22 +101,22 @@
     "language-c": "0.13.0",
     "language-coffee-script": "0.16.0",
     "language-css": "0.13.0",
-    "language-gfm": "0.22.0",
+    "language-gfm": "0.25.0",
     "language-git": "0.9.0",
     "language-go": "0.7.0",
-    "language-html": "0.14.0",
+    "language-html": "0.15.0",
     "language-hyperlink": "0.9.0",
     "language-java": "0.9.0",
     "language-javascript": "0.21.0",
     "language-json": "0.8.0",
     "language-less": "0.6.0",
     "language-make": "0.9.0",
-    "language-objective-c": "0.10.0",
+    "language-objective-c": "0.11.0",
     "language-perl": "0.8.0",
     "language-php": "0.13.0",
     "language-property-list": "0.7.0",
     "language-python": "0.12.0",
-    "language-ruby": "0.16.0",
+    "language-ruby": "0.17.0",
     "language-ruby-on-rails": "0.12.0",
     "language-sass": "0.8.0",
     "language-shellscript": "0.8.0",
@@ -124,7 +125,7 @@
     "language-text": "0.6.0",
     "language-todo": "0.9.0",
     "language-toml": "0.12.0",
-    "language-xml": "0.8.0",
+    "language-xml": "0.9.0",
     "language-yaml": "0.6.0"
   },
   "private": true,

resources/linux/Atom.desktop.in

@@ -0,0 +1,8 @@
+[Desktop Entry]
+Name=Atom
+Comment=<%= description %>
+Exec=/usr/share/atom/atom %U
+Icon=atom
+Type=Application
+StartupNotify=true
+Categories=GNOME;GTK;Utility;TextEditor;

resources/linux/debian/control.in

@@ -0,0 +1,8 @@
+Package: <%= name %>
+Version: <%= version %>
+Section: <%= section %>
+Priority: optional
+Architecture: <%= arch %>
+Installed-Size: `du -ks usr|cut -f 1`
+Maintainer: <%= maintainer %>
+Description: <%= description %>

script/bootstrap

@@ -1,4 +1,4 @@
-#!/usr/bin/env node --harmony_collections
+#!/usr/bin/env node
 
 var nodeMinorVersion = process.versions.node.split('.')[1]
 if (nodeMinorVersion !== '10') {

script/build

@@ -1,4 +1,4 @@
-#!/usr/bin/env node --harmony_collections
+#!/usr/bin/env node
 var cp = require('./utils/child-process-wrapper.js');
 var path = require('path');
 

script/cibuild

@@ -1,4 +1,4 @@
-#!/usr/bin/env node --harmony_collections
+#!/usr/bin/env node
 var cp = require('./utils/child-process-wrapper.js');
 var fs = require('fs');
 var path = require('path');

script/clean

@@ -1,4 +1,4 @@
-#!/usr/bin/env node --harmony_collections
+#!/usr/bin/env node
 var cp = require('./utils/child-process-wrapper.js');
 var path = require('path');
 var os = require('os');

script/grunt

@@ -1,4 +1,4 @@
-#!/usr/bin/env node --harmony_collections
+#!/usr/bin/env node
 var cp = require('./utils/child-process-wrapper.js');
 var path = require('path');
 

script/mkdeb

@@ -0,0 +1,31 @@
+#!/bin/bash
+# mkdeb version control-file-path deb-file-path
+
+SCRIPT=`readlink -f "$0"`
+ROOT=`readlink -f $(dirname $SCRIPT)/..`
+cd $ROOT
+
+VERSION="$1"
+CONTROL_FILE="$2"
+DESKTOP_FILE="$3"
+ICON_FILE="$4"
+DEB_PATH="$5"
+
+TARGET_ROOT="`mktemp -d`"
+TARGET="$TARGET_ROOT/atom-$VERSION"
+
+mkdir -p "$TARGET/usr"
+env INSTALL_PREFIX="$TARGET/usr" script/grunt install
+
+mkdir -p "$TARGET/DEBIAN"
+mv "$CONTROL_FILE" "$TARGET/DEBIAN/control"
+
+mkdir -p "$TARGET/usr/share/applications"
+mv "$DESKTOP_FILE" "$TARGET/usr/share/applications"
+
+mkdir -p "$TARGET/usr/share/pixmaps"
+cp "$ICON_FILE" "$TARGET/usr/share/pixmaps"
+
+dpkg-deb -b "$TARGET"
+mv "$TARGET_ROOT/atom-$VERSION.deb" "$DEB_PATH"
+rm -rf $TARGET_ROOT

script/test

@@ -1,4 +1,4 @@
-#!/usr/bin/env node --harmony_collections
+#!/usr/bin/env node
 var safeExec = require('./utils/child-process-wrapper.js').safeExec;
 var path = require('path');
 

spec/editor-view-spec.coffee

@@ -2937,14 +2937,14 @@ describe "EditorView", ->
         .editor { line-height: 2; }
       """
 
-      expect(editorView.pixelPositionForScreenPosition([1, 3])).toEqual {top: 32, left: 30}
-      expect(editorView.getCursorView().position()).toEqual {top: 32, left: 30}
+      expect(editorView.pixelPositionForScreenPosition([1, 3])).toEqual {top: 20, left: 30}
+      expect(editorView.getCursorView().position()).toEqual {top: 20, left: 30}
 
       atom.themes.applyStylesheet 'char-width', """
         .editor { letter-spacing: 2px; }
       """
-      expect(editorView.pixelPositionForScreenPosition([1, 3])).toEqual {top: 32, left: 36}
-      expect(editorView.getCursorView().position()).toEqual {top: 32, left: 36}
+      expect(editorView.pixelPositionForScreenPosition([1, 3])).toEqual {top: 20, left: 36}
+      expect(editorView.getCursorView().position()).toEqual {top: 20, left: 36}
 
   describe "when the editor contains hard tabs", ->
     it "correctly calculates the the position left for a column", ->

src/atom.coffee

@@ -34,6 +34,8 @@ WindowEventHandler = require './window-event-handler'
 #  * `atom.workspaceView` - A {WorkspaceView} instance
 module.exports =
 class Atom extends Model
+  @version: 1  # Increment this when the serialization format changes
+
   # Public: Load or create the Atom environment in the given mode.
   #
   # - mode: Pass 'editor' or 'spec' depending on the kind of environment you
@@ -41,11 +43,11 @@ class Atom extends Model
   #
   # Returns an Atom instance, fully initialized
   @loadOrCreate: (mode) ->
-    @deserialize(@loadState(mode)) ? new this({mode, version: @getVersion()})
+    @deserialize(@loadState(mode)) ? new this({mode, @version})
 
   # Deserializes the Atom environment from a state object
   @deserialize: (state) ->
-    new this(state) if state?.version is @getVersion()
+    new this(state) if state?.version is @version
 
   # Loads and returns the serialized state corresponding to this window
   # if it exists; otherwise returns undefined.
@@ -110,7 +112,7 @@ class Atom extends Model
 
   # Get the version of the Atom application.
   @getVersion: ->
-    @version ?= @getLoadSettings().appVersion
+    @appVersion ?= @getLoadSettings().appVersion
 
   # Determine whether the current version is an official release.
   @isReleasedVersion: ->

src/browser/main.coffee

@@ -9,12 +9,7 @@ optimist = require 'optimist'
 nslog = require 'nslog'
 dialog = require 'dialog'
 
-console.log = (args...) ->
-  # TODO: Make NSLog work as expected
-  output = args.map((arg) -> JSON.stringify(arg)).join(" ")
-  nslog(output)
-  if process.platform isnt 'darwin'
-    fs.writeFileSync('debug.log', output, flag: 'a')
+console.log = nslog
 
 process.on 'uncaughtException', (error={}) ->
   nslog(error.message) if error.message?

src/editor-view.coffee

@@ -44,6 +44,7 @@ class EditorView extends View
   @configDefaults:
     fontFamily: ''
     fontSize: 16
+    lineHeight: 1.3
     showInvisibles: false
     showIndentGuide: false
     showLineNumbers: true
@@ -340,6 +341,8 @@ class EditorView extends View
     @subscribe atom.config.observe 'editor.invisibles', (invisibles) => @setInvisibles(invisibles)
     @subscribe atom.config.observe 'editor.fontSize', (fontSize) => @setFontSize(fontSize)
     @subscribe atom.config.observe 'editor.fontFamily', (fontFamily) => @setFontFamily(fontFamily)
+    @subscribe atom.config.observe 'editor.lineHeight', (lineHeight) => @setLineHeight(lineHeight)
+
 
   handleEvents: ->
     @on 'focus', =>
@@ -747,6 +750,17 @@ class EditorView extends View
   # Returns a {String} identifying the CSS `font-family`.
   getFontFamily: -> @css("font-family")
 
+  # Public: Sets the line height of the editor.
+  #
+  # Calling this method has no effect when called on a mini editor.
+  #
+  # lineHeight - A {Number} without a unit suffix identifying the CSS
+  # `line-height`.
+  setLineHeight: (lineHeight) ->
+    return if @mini
+    @css('line-height', lineHeight)
+    @redraw()
+
   # Public: Redraw the editor
   redraw: ->
     return unless @hasParent()
@@ -885,7 +899,7 @@ class EditorView extends View
     @setHeightInLines()
 
   recalculateDimensions: ->
-    return unless @attached
+    return unless @attached and @isVisible()
 
     oldCharWidth = @charWidth
     oldLineHeight = @lineHeight
@@ -896,7 +910,7 @@ class EditorView extends View
       @clearCharacterWidthCache()
       @requestDisplayUpdate()
 
-  updateLayerDimensions: ->
+  updateLayerDimensions: (scrollViewWidth) ->
     height = @lineHeight * @editor.getScreenLineCount()
     unless @layerHeight == height
       @layerHeight = height
@@ -906,7 +920,7 @@ class EditorView extends View
       @verticalScrollbarContent.height(@layerHeight)
       @scrollBottom(height) if @scrollBottom() > height
 
-    minWidth = Math.max(@charWidth * @editor.getMaxScreenLineLength() + 20, @scrollView.width())
+    minWidth = Math.max(@charWidth * @editor.getMaxScreenLineLength() + 20, scrollViewWidth)
     unless @layerMinWidth == minWidth
       @renderedLines.css('min-width', minWidth)
       @underlayer.css('min-width', minWidth)
@@ -940,7 +954,7 @@ class EditorView extends View
     @setSoftWrap(@editor.getSoftWrap())
     @newCursors = @editor.getCursors()
     @newSelections = @editor.getSelections()
-    @updateDisplay(suppressAutoScroll: true)
+    @updateDisplay(suppressAutoscroll: true)
 
   requestDisplayUpdate: ->
     return if @pendingDisplayUpdate
@@ -950,19 +964,20 @@ class EditorView extends View
       @updateDisplay()
       @pendingDisplayUpdate = false
 
-  updateDisplay: (options={}) ->
+  updateDisplay: (options) ->
     return unless @attached and @editor
     return if @editor.isDestroyed()
     unless @isOnDom() and @isVisible()
       @redrawOnReattach = true
       return
 
-    @updateRenderedLines()
+    scrollViewWidth = @scrollView.width()
+    @updateRenderedLines(scrollViewWidth)
     @updatePlaceholderText()
     @highlightCursorLine()
     @updateCursorViews()
     @updateSelectionViews()
-    @autoscroll(options)
+    @autoscroll(options?.suppressAutoscroll ? false)
     @trigger 'editor:display-updated'
 
   updateCursorViews: ->
@@ -1005,14 +1020,14 @@ class EditorView extends View
   syncCursorAnimations: ->
     cursorView.resetBlinking() for cursorView in @getCursorViews()
 
-  autoscroll: (options={}) ->
+  autoscroll: (suppressAutoscroll) ->
     for cursorView in @getCursorViews()
-      if !options.suppressAutoScroll and cursorView.needsAutoscroll()
+      if !suppressAutoscroll and cursorView.needsAutoscroll()
         @scrollToPixelPosition(cursorView.getPixelPosition())
       cursorView.clearAutoscroll()
 
     for selectionView in @getSelectionViews()
-      if !options.suppressAutoScroll and selectionView.needsAutoscroll()
+      if !suppressAutoscroll and selectionView.needsAutoscroll()
         @scrollToPixelPosition(selectionView.getCenterPixelPosition(), center: true)
         selectionView.highlight()
       selectionView.clearAutoscroll()
@@ -1028,7 +1043,7 @@ class EditorView extends View
       else
         @underlayer.append($('<span/>', class: 'placeholder-text', text: @placeholderText))
 
-  updateRenderedLines: ->
+  updateRenderedLines: (scrollViewWidth) ->
     firstVisibleScreenRow = @getFirstVisibleScreenRow()
     lastScreenRowToRender = firstVisibleScreenRow + @heightInLines - 1
     lastScreenRow = @editor.getLastScreenRow()
@@ -1052,7 +1067,7 @@ class EditorView extends View
     @fillDirtyRanges(intactRanges, renderFrom, renderTo)
     @firstRenderedScreenRow = renderFrom
     @lastRenderedScreenRow = renderTo
-    @updateLayerDimensions()
+    @updateLayerDimensions(scrollViewWidth)
     @updatePaddingOfRenderedLines()
 
   computeSurroundingEmptyLineChanges: (change) ->

src/git.coffee

@@ -10,6 +10,18 @@ GitUtils = require 'git-utils'
 # `atom.project` global and calling `getRepo()`. Note that this will only be
 # available when the project is backed by a Git repository.
 #
+# This class handles submodules automically by taking a `path` argument to many
+# of the methods.  This `path` argument will determine which underlying
+# repository is used.
+#
+# For a repository with submodules this would have the following outcome:
+#
+# ```coffee
+# repo = atom.project.getRepo()
+# repo.getShortHead() # 'master'
+# repo.getShortHead('vendor/path/to/a/submodule') # 'dead1234'
+# ```
+#
 # ## Example
 #
 # ```coffeescript
@@ -89,10 +101,11 @@ class Git
     @unsubscribe()
 
   # Returns the corresponding {Repository}
-  getRepo: ->
-    unless @repo?
+  getRepo: (path) ->
+    if @repo?
+      @repo.submoduleForPath(path) ? @repo
+    else
       throw new Error("Repository has been destroyed")
-    @repo
 
   # Reread the index to update any values that have changed since the
   # last time the index was read.
@@ -113,7 +126,8 @@ class Git
   # {::isStatusModified} or {::isStatusNew} to get more information.
   getPathStatus: (path) ->
     currentPathStatus = @statuses[path] ? 0
-    pathStatus = @getRepo().getStatus(@relativize(path)) ? 0
+    repo = @getRepo(path)
+    pathStatus = repo.getStatus(repo.relativize(path)) ? 0
     if pathStatus > 0
       @statuses[path] = pathStatus
     else
@@ -153,8 +167,11 @@ class Git
   # `refs/remotes`.  It also shortens the SHA-1 of a detached `HEAD` to 7
   # characters.
   #
+  # path - An optional {String} path in the repository to get this information
+  #        for, only needed if the repository contains submodules.
+  #
   # Returns a {String}.
-  getShortHead: -> @getRepo().getShortHead()
+  getShortHead: (path) -> @getRepo(path).getShortHead()
 
   # Public: Restore the contents of a path in the working directory and index
   # to the version at `HEAD`.
@@ -170,7 +187,8 @@ class Git
   #
   # Returns a {Boolean} that's true if the method was successful.
   checkoutHead: (path) ->
-    headCheckedOut = @getRepo().checkoutHead(@relativize(path))
+    repo = @getRepo(path)
+    headCheckedOut = repo.checkoutHead(repo.relativize(path))
     @getPathStatus(path) if headCheckedOut
     headCheckedOut
 
@@ -194,14 +212,22 @@ class Git
   # Returns an {Object} with the following keys:
   #   :added - The {Number} of added lines.
   #   :deleted - The {Number} of deleted lines.
-  getDiffStats: (path) -> @getRepo().getDiffStats(@relativize(path))
+  getDiffStats: (path) ->
+    repo = @getRepo(path)
+    repo.getDiffStats(repo.relativize(path))
 
   # Public: Is the given path a submodule in the repository?
   #
   # path - The {String} path to check.
   #
   # Returns a {Boolean}.
-  isSubmodule: (path) -> @getRepo().isSubmodule(@relativize(path))
+  isSubmodule: (path) ->
+    repo = @getRepo(path)
+    if repo.isSubmodule(repo.relativize(path))
+      true
+    else
+      # Check if the path is a working directory in a repo that isn't the root.
+      path is repo.getWorkingDirectory() and repo isnt @getRepo()
 
   # Public: Get the status of a directory in the repository's working directory.
   #
@@ -232,34 +258,69 @@ class Git
     # Ignore eol of line differences on windows so that files checked in as
     # LF don't report every line modified when the text contains CRLF endings.
     options = ignoreEolWhitespace: process.platform is 'win32'
-    @getRepo().getLineDiffs(@relativize(path), text, options)
+    repo = @getRepo(path)
+    repo.getLineDiffs(repo.relativize(path), text, options)
 
   # Public: Returns the git configuration value specified by the key.
-  getConfigValue: (key) -> @getRepo().getConfigValue(key)
+  #
+  # path - An optional {String} path in the repository to get this information
+  #        for, only needed if the repository has submodules.
+  getConfigValue: (key, path) -> @getRepo(path).getConfigValue(key)
 
   # Public: Returns the origin url of the repository.
-  getOriginUrl: -> @getConfigValue('remote.origin.url')
+  #
+  # path - An optional {String} path in the repository to get this information
+  #        for, only needed if the repository has submodules.
+  getOriginUrl: (path) -> @getConfigValue('remote.origin.url', path)
 
   # Public: Returns the upstream branch for the current HEAD, or null if there
   # is no upstream branch for the current HEAD.
   #
+  # path - An optional {String} path in the repo to get this information for,
+  #        only needed if the repository contains submodules.
+  #
   # Returns a {String} branch name such as `refs/remotes/origin/master`.
-  getUpstreamBranch: -> @getRepo().getUpstreamBranch()
+  getUpstreamBranch: (path) -> @getRepo(path).getUpstreamBranch()
 
   # Public: Returns the current SHA for the given reference.
-  getReferenceTarget: (reference) -> @getRepo().getReferenceTarget(reference)
+  #
+  # reference - The {String} reference to get the target of.
+  # path - An optional {String} path in the repo to get the reference target
+  #        for. Only needed if the repository contains submodules.
+  getReferenceTarget: (reference, path) ->
+    @getRepo(path).getReferenceTarget(reference)
 
   # Public: Gets all the local and remote references.
   #
+  # path - An optional {String} path in the repository to get this information
+  #        for, only needed if the repository has submodules.
+  #
   # Returns an {Object} with the following keys:
   #  :heads - An {Array} of head reference names.
   #  :remotes - An {Array} of remote reference names.
   #  :tags - An {Array} of tag reference names.
-  getReferences: -> @getRepo().getReferences()
+  getReferences: (path) -> @getRepo(path).getReferences()
 
   # Public: Returns the number of commits behind the current branch is from the
   # its upstream remote branch.
-  getAheadBehindCount: (reference) -> @getRepo().getAheadBehindCount(reference)
+  #
+  # reference - The {String} branch reference name.
+  # path      - The {String} path in the repository to get this information for,
+  #             only needed if the repository contains submodules.
+  getAheadBehindCount: (reference, path) ->
+    @getRepo(path).getAheadBehindCount(reference)
+
+  # Public: Get the cached ahead/behind commit counts for the current branch's
+  # upstream branch.
+  #
+  # path - An optional {String} path in the repository to get this information
+  #        for, only needed if the repository has submodules.
+  #
+  # Returns an {Object} with the following keys:
+  #   :ahead  - The {Number} of commits ahead.
+  #   :behind - The {Number} of commits behind.
+  getCachedUpstreamAheadBehindCount: (path) ->
+    @getRepo(path).upstream ? @upstream
 
   # Public: Returns true if the given branch exists.
   hasBranch: (branch) -> @getReferenceTarget("refs/heads/#{branch}")?
@@ -267,9 +328,19 @@ class Git
   # Refreshes the current git status in an outside process and asynchronously
   # updates the relevant properties.
   refreshStatus: ->
-    @statusTask = Task.once require.resolve('./repository-status-handler'), @getPath(), ({statuses, upstream, branch}) =>
-      statusesUnchanged = _.isEqual(statuses, @statuses) and _.isEqual(upstream, @upstream) and _.isEqual(branch, @branch)
+    handlerPath = require.resolve('./repository-status-handler')
+    @statusTask = Task.once handlerPath, @getPath(), ({statuses, upstream, branch, submodules}) =>
+      statusesUnchanged = _.isEqual(statuses, @statuses) and
+                          _.isEqual(upstream, @upstream) and
+                          _.isEqual(branch, @branch) and
+                          _.isEqual(submodules, @submodules)
+
       @statuses = statuses
       @upstream = upstream
       @branch = branch
+      @submodules = submodules
+
+      for submodulePath, submoduleRepo of @getRepo().submodules
+        submoduleRepo.upstream = submodules[submodulePath].upstream
+
       @emit 'statuses-changed' unless statusesUnchanged

src/menu-manager.coffee

@@ -77,7 +77,7 @@ class MenuManager
       keystrokesByCommand = {}
       for binding in atom.keymap.getKeyBindings() when @includeSelector(binding.selector)
         keystrokesByCommand[binding.command] ?= []
-        keystrokesByCommand[binding.command].push binding.keystroke
+        keystrokesByCommand[binding.command].unshift binding.keystroke
       @sendToBrowserProcess(@template, keystrokesByCommand)
 
   loadPlatformItems: ->

src/repository-status-handler.coffee

@@ -3,17 +3,30 @@ path = require 'path'
 
 module.exports = (repoPath) ->
   repo = Git.open(repoPath)
+
+  upstream = {}
+  statuses = {}
+  submodules = {}
+  branch = null
+
   if repo?
+    # Statuses in main repo
     workingDirectoryPath = repo.getWorkingDirectory()
-    statuses = {}
     for filePath, status of repo.getStatus()
       statuses[path.join(workingDirectoryPath, filePath)] = status
+
+    # Statuses in submodules
+    for submodulePath, submoduleRepo of repo.submodules
+      submodules[submodulePath] =
+        branch: submoduleRepo.getHead()
+        upstream: submoduleRepo.getAheadBehindCount()
+
+      workingDirectoryPath = submoduleRepo.getWorkingDirectory()
+      for filePath, status of submoduleRepo.getStatus()
+        statuses[path.join(workingDirectoryPath, filePath)] = status
+
     upstream = repo.getAheadBehindCount()
     branch = repo.getHead()
     repo.release()
-  else
-    upstream = {}
-    statuses = {}
-    branch = null
 
-  {statuses, upstream, branch}
+  {statuses, upstream, branch, submodules}