From b682658427eb9edb5cf9b152652817a8305bf43e Mon Sep 17 00:00:00 2001
From: Max Brunsfeld <maxbrunsfeld@gmail.com>
Date: Fri, 31 Jul 2015 10:37:56 -0700
Subject: [PATCH] Rename 'disabledKeymaps' -> 'packagesWithKeymapsDisabled'

---
 spec/package-manager-spec.coffee |  8 ++++----
 src/package-manager.coffee       | 14 +++++++-------
 src/package.coffee               |  2 +-
 3 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/spec/package-manager-spec.coffee b/spec/package-manager-spec.coffee
index 72b8d6294..1604209d5 100644
--- a/spec/package-manager-spec.coffee
+++ b/spec/package-manager-spec.coffee
@@ -444,7 +444,7 @@ describe "PackageManager", ->
 
           expect(atom.keymaps.findKeyBindings(keystrokes: 'ctrl-z', target: element1[0])).toHaveLength 0
 
-          atom.config.set("core.disabledKeymaps", ["package-with-keymaps-manifest"])
+          atom.config.set("core.packagesWithKeymapsDisabled", ["package-with-keymaps-manifest"])
 
           waitsForPromise ->
             atom.packages.activatePackage("package-with-keymaps-manifest")
@@ -455,16 +455,16 @@ describe "PackageManager", ->
       describe "when the package's keymaps are disabled and re-enabled after it is activated", ->
         it "removes and re-adds the keymaps", ->
           element1 = $$ -> @div class: 'test-1'
-          atom.packages.observeDisabledKeymaps()
+          atom.packages.observePackagesWithKeymapsDisabled()
 
           waitsForPromise ->
             atom.packages.activatePackage("package-with-keymaps-manifest")
 
           runs ->
-            atom.config.set("core.disabledKeymaps", ['package-with-keymaps-manifest'])
+            atom.config.set("core.packagesWithKeymapsDisabled", ['package-with-keymaps-manifest'])
             expect(atom.keymaps.findKeyBindings(keystrokes: 'ctrl-z', target: element1[0])).toHaveLength 0
 
-            atom.config.set("core.disabledKeymaps", [])
+            atom.config.set("core.packagesWithKeymapsDisabled", [])
             expect(atom.keymaps.findKeyBindings(keystrokes: 'ctrl-z', target: element1[0])[0].command).toBe 'keymap-1'
 
     describe "menu loading", ->
diff --git a/src/package-manager.coffee b/src/package-manager.coffee
index ba8ec016c..f96186b43 100644
--- a/src/package-manager.coffee
+++ b/src/package-manager.coffee
@@ -310,12 +310,12 @@ class PackageManager
       @activatePackage(packageName) for packageName in packagesToEnable
       null
 
-  unobserveDisabledKeymaps: ->
-    @disabledKeymapsSubscription?.dispose()
-    @disabledKeymapsSubscription = null
+  unobservePackagesWithKeymapsDisabled: ->
+    @packagesWithKeymapsDisabledSubscription?.dispose()
+    @packagesWithKeymapsDisabledSubscription = null
 
-  observeDisabledKeymaps: ->
-    @disabledKeymapsSubscription ?= atom.config.onDidChange 'core.disabledKeymaps', ({newValue, oldValue}) =>
+  observePackagesWithKeymapsDisabled: ->
+    @packagesWithKeymapsDisabledSubscription ?= atom.config.onDidChange 'core.packagesWithKeymapsDisabled', ({newValue, oldValue}) =>
       keymapsToEnable = _.difference(oldValue, newValue)
       keymapsToDisable = _.difference(newValue, oldValue)
 
@@ -409,7 +409,7 @@ class PackageManager
         promises.push(promise) unless pack.hasActivationCommands()
       return
     @observeDisabledPackages()
-    @observeDisabledKeymaps()
+    @observePackagesWithKeymapsDisabled()
     promises
 
   # Activate a single package by name
@@ -438,7 +438,7 @@ class PackageManager
       @deactivatePackage(pack.name) for pack in @getLoadedPackages()
       return
     @unobserveDisabledPackages()
-    @unobserveDisabledKeymaps()
+    @unobservePackagesWithKeymapsDisabled()
 
   # Deactivate the package with the given name
   deactivatePackage: (name) ->
diff --git a/src/package.coffee b/src/package.coffee
index ef6d0e4db..25bf3a038 100644
--- a/src/package.coffee
+++ b/src/package.coffee
@@ -201,7 +201,7 @@ class Package
   activateResources: ->
     @activationDisposables = new CompositeDisposable
 
-    keymapIsDisabled = _.include(atom.config.get("core.disabledKeymaps") ? [], @name)
+    keymapIsDisabled = _.include(atom.config.get("core.packagesWithKeymapsDisabled") ? [], @name)
     if keymapIsDisabled
       @deactivateKeymaps()
     else