Merge branch 'master' into cj-add-react-editor-shims

Conflicts:
	package.json

apm/package.json

@@ -6,6 +6,6 @@
     "url": "https://github.com/atom/atom.git"
   },
   "dependencies": {
-    "atom-package-manager": "0.65.0"
+    "atom-package-manager": "0.68.0"
   }
 }

build/package.json

@@ -18,7 +18,7 @@
     "grunt-contrib-coffee": "~0.9.0",
     "grunt-contrib-less": "~0.8.0",
     "grunt-cson": "0.8.0",
-    "grunt-download-atom-shell": "~0.7.2",
+    "grunt-download-atom-shell": "~0.8.0",
     "grunt-lesslint": "0.13.0",
     "grunt-markdown": "~0.4.0",
     "grunt-peg": "~1.1.0",

build/tasks/mkdeb-task.coffee

@@ -13,9 +13,15 @@ module.exports = (grunt) ->
   grunt.registerTask 'mkdeb', 'Create debian package', ->
     done = @async()
 
+    if process.arch is 'ia32'
+      arch = 'i386'
+    else if process.arch is 'x64'
+      arch = 'amd64'
+    else
+      return done("Unsupported arch #{process.arch}")
+
     {name, version, description} = grunt.file.readJSON('package.json')
     section = 'devel'
-    arch = 'amd64'
     maintainer = 'GitHub <atom@github.com>'
     data = {name, version, description, section, arch, maintainer}
 
@@ -27,5 +33,5 @@ module.exports = (grunt) ->
     buildDir = grunt.config.get('atom.buildDir')
 
     cmd = path.join('script', 'mkdeb')
-    args = [version, control, desktop, icon, buildDir]
+    args = [version, arch, control, desktop, icon, buildDir]
     spawn({cmd, args}, done)

docs/build-instructions/linux.md

@@ -4,7 +4,7 @@ Ubuntu LTS 12.04 64-bit is the recommended platform.
 
 ## Requirements
 
-  * OS with 64-bit architecture
+  * OS with 64-bit or 32-bit architecture
   * [node.js](http://nodejs.org/download/) v0.10.x
   * [npm](http://www.npmjs.org/) v1.4.x  
   * libgnome-keyring-dev

docs/build-instructions/windows.md

@@ -45,5 +45,11 @@ fix this, you probably need to fiddle with your system PATH.
   * If you just installed node you need to restart your computer before node is
   available on your Path.
 
+
+* `script/build` outputs only the Node and Python versions before returning
+
+  * Try moving the repository to `C:\atom`. Most likely, the path is too long.
+    See [issue #2200](https://github.com/atom/atom/issues/2200).
+
 ### Windows build error reports in atom/atom
 * Use [this search](https://github.com/atom/atom/search?q=label%3Abuild-error+label%3Awindows&type=Issues) to get a list of reports about build errors on Windows.

docs/index.md

@@ -9,6 +9,7 @@
 * [Converting a TextMate Bundle](converting-a-text-mate-bundle.md)
 * [Converting a TextMate Theme](converting-a-text-mate-theme.md)
 * [Contributing](contributing.md)
+* [Debugging](debugging.md)
 
 ### Advanced Topics
 

package.json

@@ -1,7 +1,7 @@
 {
   "name": "atom",
   "productName": "Atom",
-  "version": "0.101.0",
+  "version": "0.102.0",
   "description": "A hackable text editor for the 21st Century.",
   "main": "./src/browser/main.js",
   "repository": {
@@ -17,7 +17,7 @@
       "url": "http://github.com/atom/atom/raw/master/LICENSE.md"
     }
   ],
-  "atomShellVersion": "0.12.7",
+  "atomShellVersion": "0.13.0",
   "dependencies": {
     "async": "0.2.6",
     "atom-keymap": "^0.26.0",
@@ -54,7 +54,7 @@
     "season": "^1.0.2",
     "semver": "1.1.4",
     "serializable": "^1",
-    "space-pen": "3.2.2",
+    "space-pen": "3.3.0",
     "temp": "0.5.0",
     "text-buffer": "^2.2.2",
     "theorist": "^1",
@@ -67,7 +67,7 @@
     "atom-light-syntax": "0.17.0",
     "atom-light-ui": "0.25.0",
     "base16-tomorrow-dark-theme": "0.16.0",
-    "solarized-dark-syntax": "0.16.0",
+    "solarized-dark-syntax": "0.17.0",
     "solarized-light-syntax": "0.8.0",
     "archive-view": "0.31.0",
     "autocomplete": "0.28.0",
@@ -75,7 +75,7 @@
     "autosave": "0.13.0",
     "background-tips": "0.14.0",
     "bookmarks": "0.22.0",
-    "bracket-matcher": "0.42.0",
+    "bracket-matcher": "0.43.0",
     "command-palette": "0.21.0",
     "deprecation-cop": "0.6.0",
     "dev-live-reload": "0.31.0",
@@ -86,10 +86,10 @@
     "git-diff": "0.28.0",
     "go-to-line": "0.22.0",
     "grammar-selector": "0.27.0",
-    "image-view": "0.33.0",
+    "image-view": "0.34.0",
     "keybinding-resolver": "0.18.0",
     "link": "0.22.0",
-    "markdown-preview": "0.73.0",
+    "markdown-preview": "0.74.0",
     "metrics": "0.32.0",
     "open-on-github": "0.28.0",
     "package-generator": "0.30.0",
@@ -107,10 +107,10 @@
     "welcome": "0.16.0",
     "whitespace": "0.22.0",
     "wrap-guide": "0.18.0",
-    "language-c": "0.15.0",
+    "language-c": "0.16.0",
     "language-coffee-script": "0.22.0",
     "language-css": "0.17.0",
-    "language-gfm": "0.38.0",
+    "language-gfm": "0.39.0",
     "language-git": "0.9.0",
     "language-go": "0.12.0",
     "language-html": "0.22.0",
@@ -127,7 +127,7 @@
     "language-python": "0.18.0",
     "language-ruby": "0.27.0",
     "language-ruby-on-rails": "0.14.0",
-    "language-sass": "0.12.0",
+    "language-sass": "0.13.0",
     "language-shellscript": "0.8.0",
     "language-source": "0.7.0",
     "language-sql": "0.8.0",

script/clean

@@ -1,9 +1,10 @@
 #!/usr/bin/env node
 var cp = require('./utils/child-process-wrapper.js');
+var fs = require('fs');
 var path = require('path');
 var os = require('os');
 
-var removeCommand = process.platform === 'win32' ? 'del /F /Q /S ' : 'rm -rf ';
+var removeCommand = process.platform === 'win32' ? 'rmdir /S /Q ' : 'rm -rf ';
 var productName = require('../package.json').productName;
 
 process.chdir(path.dirname(__dirname));
@@ -30,8 +31,15 @@ var run = function() {
   var next = commands.shift();
   if (!next)
     process.exit(0);
-  if (Array.isArray(next))
-    next = removeCommand + path.resolve.apply(path.resolve, next);
+
+  if (Array.isArray(next)) {
+    var pathToRemove = path.resolve.apply(path.resolve, next);
+    if (fs.existsSync(pathToRemove))
+      next = removeCommand + pathToRemove;
+    else
+      return run();
+  }
+
   cp.safeExec(next, run);
 };
 run();

script/mkdeb

@@ -8,14 +8,15 @@ ROOT=`readlink -f $(dirname $SCRIPT)/..`
 cd $ROOT
 
 VERSION="$1"
-CONTROL_FILE="$2"
-DESKTOP_FILE="$3"
-ICON_FILE="$4"
-DEB_PATH="$5"
+ARCH="$2"
+CONTROL_FILE="$3"
+DESKTOP_FILE="$4"
+ICON_FILE="$5"
+DEB_PATH="$6"
 
 TARGET_ROOT="`mktemp -d`"
 chmod 755 "$TARGET_ROOT"
-TARGET="$TARGET_ROOT/atom-$VERSION-amd64"
+TARGET="$TARGET_ROOT/atom-$VERSION-$ARCH"
 
 mkdir -p "$TARGET/usr"
 env INSTALL_PREFIX="$TARGET/usr" script/grunt install
@@ -30,5 +31,5 @@ mkdir -p "$TARGET/usr/share/pixmaps"
 cp "$ICON_FILE" "$TARGET/usr/share/pixmaps"
 
 dpkg-deb -b "$TARGET"
-mv "$TARGET_ROOT/atom-$VERSION-amd64.deb" "$DEB_PATH"
+mv "$TARGET_ROOT/atom-$VERSION-$ARCH.deb" "$DEB_PATH"
 rm -rf $TARGET_ROOT

static/editor.less

@@ -18,6 +18,7 @@
 
   .cursor {
     z-index: 2;
+    pointer-events: none;
   }
 
   .editor-contents.is-focused .cursor {