From b05d09988658398a14154f5bcb85af5451d2c600 Mon Sep 17 00:00:00 2001
From: Henrik Lissner <henrik@lissner.net>
Date: Sat, 1 Aug 2015 14:40:19 +0200
Subject: [PATCH] company: disable C-w

---
 core/core-company.el   | 2 ++
 private/my-bindings.el | 6 ++----
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/core/core-company.el b/core/core-company.el
index a06b515c5..78986625b 100644
--- a/core/core-company.el
+++ b/core/core-company.el
@@ -41,6 +41,8 @@
         evil-complete-next-func           'narf/company-evil-complete-next
         evil-complete-previous-func       'narf/company-evil-complete-previous)
 
+  (define-key company-active-map (kbd "C-w") nil)
+
   (shut-up!
     (setq company-statistics-file (! (concat narf-temp-dir "company-statistics-cache.el")))
     (require 'company-statistics)
diff --git a/private/my-bindings.el b/private/my-bindings.el
index 2d702d835..858a5df6e 100644
--- a/private/my-bindings.el
+++ b/private/my-bindings.el
@@ -235,13 +235,11 @@
      [tab]        'company-complete
      "<backtab>"  'company-select-previous
      [escape]     'company-abort
-     "<C-return>" 'helm-company
-     :unset "C-w")
+     "<C-return>" 'helm-company)
    (:map company-search-map
      "C-n"        'company-search-repeat-forward
      "C-p"        'company-search-repeat-backward
-     [escape]     'company-abort
-     :unset "C-w"))
+     [escape]     'company-abort))
 
  (:after help-mode
    (:map help-mode-map