From ab548bc9466062e65ec176de102c04536105e017 Mon Sep 17 00:00:00 2001
From: Corey Johnson <cj@github.com>
Date: Tue, 3 Jul 2012 13:43:30 -0700
Subject: [PATCH] Rename `extension` to `requireExtension`

---
 src/app/window.coffee | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/src/app/window.coffee b/src/app/window.coffee
index 923e0b007..35382f5a0 100644
--- a/src/app/window.coffee
+++ b/src/app/window.coffee
@@ -55,14 +55,15 @@ windowAdditions =
     return if $("head style[path='#{fullPath}']").length
     $('head').append "<style path='#{fullPath}'>#{content}</style>"
 
-  extension: (name) ->
+  requireExtension: (name) ->
     extensionPath = require.resolve name
-    extension = require extensionPath
-    rootView.activateExtension(extension)
+    extension = rootView.activateExtension require(extensionPath)
 
     extensionKeymapPath = fs.join(fs.directory(extensionPath), "keymap.coffee")
     require extensionKeymapPath if fs.exists(extensionKeymapPath)
 
+    extension
+
   reload: ->
     if rootView.getModifiedBuffers().length > 0
       message = "There are unsaved buffers, reload anyway?"