From 5b31fd9505bd808761c93042cbc14ee4b40be4e1 Mon Sep 17 00:00:00 2001
From: Henrik Lissner <henrik@lissner.net>
Date: Mon, 28 May 2018 00:08:14 +0200
Subject: [PATCH] Use company-dabbrev-code in prog-modes & company-dabbrev
 everywhere else

---
 modules/completion/company/autoload.el | 12 +++++++++++-
 modules/config/default/+bindings.el    |  2 +-
 2 files changed, 12 insertions(+), 2 deletions(-)

diff --git a/modules/completion/company/autoload.el b/modules/completion/company/autoload.el
index b6c444382..ae89ac809 100644
--- a/modules/completion/company/autoload.el
+++ b/modules/completion/company/autoload.el
@@ -16,6 +16,16 @@
              (= company-candidates-length 1))
     (company-complete-common)))
 
+;;;###autoload
+(defun +company/dabbrev ()
+  "Invokes `company-dabbrev-code' in prog-mode buffers and `company-dabbrev'
+everywhere else."
+  (interactive)
+  (call-interactively
+   (if (derived-mode-p 'prog-mode)
+       #'company-dabbrev-code
+     #'company-dabbrev)))
+
 ;;;###autoload
 (defun +company/whole-lines (command &optional arg &rest ignored)
   "`company-mode' completion backend that completes whole-lines, akin to vim's
@@ -49,5 +59,5 @@ C-x C-l."
   (interactive)
   (require 'company-dabbrev)
   (let ((company-selection-wrap-around t))
-    (call-interactively #'company-dabbrev-code)
+    (call-interactively #'+company/dabbrev)
     (company-select-previous-or-abort)))
diff --git a/modules/config/default/+bindings.el b/modules/config/default/+bindings.el
index 828decabc..158399161 100644
--- a/modules/config/default/+bindings.el
+++ b/modules/config/default/+bindings.el
@@ -376,7 +376,7 @@
         :i "s"     #'company-ispell
         :i "C-s"   #'company-yasnippet
         :i "C-o"   #'company-capf
-        :i "C-n"   #'company-dabbrev-code
+        :i "C-n"   #'+company/dabbrev
         :i "C-p"   #'+company/dabbrev-code-previous)
       (:after company
         (:map company-active-map