summary refs log tree commit diff stats
path: root/emacs/.emacs.d
diff options
context:
space:
mode:
authorAlan Pearce2017-09-08 23:15:44 +0200
committerAlan Pearce2017-09-08 23:15:44 +0200
commit6a9bfc533275097f88c10c95c28804a014896931 (patch)
tree483b0607920760acbb047e60336aa747322595f6 /emacs/.emacs.d
parent0f70a52af55ff90f10282d4894dfba0bb0dd0404 (diff)
downloadnixfiles-6a9bfc533275097f88c10c95c28804a014896931.tar.lz
nixfiles-6a9bfc533275097f88c10c95c28804a014896931.tar.zst
nixfiles-6a9bfc533275097f88c10c95c28804a014896931.zip
Emacs: Add company fallback keybind to overriding keymap
Diffstat (limited to 'emacs/.emacs.d')
-rw-r--r--emacs/.emacs.d/main.el4
1 files changed, 2 insertions, 2 deletions
diff --git a/emacs/.emacs.d/main.el b/emacs/.emacs.d/main.el
index 1844ffd3..b51e1f3b 100644
--- a/emacs/.emacs.d/main.el
+++ b/emacs/.emacs.d/main.el
@@ -1137,8 +1137,8 @@
 (use-package company
   :commands (company-mode)
   :diminish "Cmpl"
-  :bind (("C-<tab>" . company-complete)
-         ("TAB" . company-indent-or-complete-common))
+  :bind* (("C-<tab>" . company-complete))
+  :bind  (("TAB" . company-indent-or-complete-common))
   :init (progn
           (add-hook 'prog-mode-hook #'company-mode-on)
           (setq company-backends '(company-bbdb company-web-html company-tern company-nxml company-css company-eclim company-semantic company-elisp