From 8ceb2e2028edddb84017479371ee80bd64f85e2f Mon Sep 17 00:00:00 2001
From: Kevin Sawicki <kevin@github.com>
Date: Wed, 25 Mar 2015 18:09:00 -0700
Subject: [PATCH] Don't extend Model in 1.0 mode

---
 src/atom.coffee | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/src/atom.coffee b/src/atom.coffee
index b787764be..463f5a7bf 100644
--- a/src/atom.coffee
+++ b/src/atom.coffee
@@ -16,11 +16,13 @@ fs = require 'fs-plus'
 WindowEventHandler = require './window-event-handler'
 StylesElement = require './styles-element'
 
+SuperClass = if includeDeprecations then Model else Object
+
 # Essential: Atom global for dealing with packages, themes, menus, and the window.
 #
 # An instance of this class is always available as the `atom` global.
 module.exports =
-class Atom extends Model
+class Atom extends SuperClass
   @version: 1  # Increment this when the serialization format changes
 
   # Load or create the Atom environment in the given mode.
@@ -230,7 +232,7 @@ class Atom extends Model
         @openDevTools()
         @executeJavaScriptInDevTools('InspectorFrontendAPI.showConsole()')
 
-      @emit 'uncaught-error', arguments...
+      @emit 'uncaught-error', arguments... if includeDeprecations
       @emitter.emit 'did-throw-error', {message, url, line, column, originalError}
 
     @disposables?.dispose()