From cebb82f39eb3d2b1fb9ec571fa576b49b0732be5 Mon Sep 17 00:00:00 2001 From: Maciej Szlosarczyk Date: Fri, 5 Jul 2019 10:39:51 +0300 Subject: [PATCH] Add company C-p and C-n bindings --- 06company-yasnippet.el | 5 +++++ 20erlang.el | 4 ++-- 20web.el | 8 +------- 3 files changed, 8 insertions(+), 9 deletions(-) diff --git a/06company-yasnippet.el b/06company-yasnippet.el index 9d328da..aa4b05a 100644 --- a/06company-yasnippet.el +++ b/06company-yasnippet.el @@ -37,6 +37,11 @@ company-lsp-async 1 ;; Fetch LSP results asynchronously ) +;; Use standard emacs next and previous bindings for navigating company +;; suggestions +(define-key company-active-map (kbd "C-p") 'company-select-previous-or-abort) +(define-key company-active-map (kbd "C-n") 'company-select-next-or-abort) + ;;; Yasnippet configuration (define-key prog-mode-map (kbd "C-c y") 'company-yasnippet) (define-key prog-mode-map (kbd "") 'company-indent-or-complete-common) diff --git a/20erlang.el b/20erlang.el index 3112d54..c8c2ac2 100644 --- a/20erlang.el +++ b/20erlang.el @@ -1,8 +1,8 @@ ;; Add erlang installation to load path -(setq erlang-asdf-root "/Users/maciej/.asdf/installs/erlang/22.0.4/") +(setq erlang-asdf-root "$HOME/.asdf/installs/erlang/21.3.8/") (setq load-path - (cons (format "%slib/tools-3.2/emacs" erlang-asdf-root) + (cons (format "%slib/tools-3.1/emacs" erlang-asdf-root) load-path)) (require 'erlang-start) diff --git a/20web.el b/20web.el index d76f541..7ef202f 100644 --- a/20web.el +++ b/20web.el @@ -11,10 +11,4 @@ '(company-yasnippet company-lsp))) (add-hook 'js2-mode-hook 'activate-js2-mode) - -(defun activate-web-mode () - ;; Company list override - (add-to-list (make-local-variable 'company-backends) - '(company-web-html company-yasnippet))) - -(add-hook 'web-mode-hook 'activate-web-mode) +(add-to-list 'auto-mode-alist '("\\.tsx\\'" . web-mode))