summaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
-rw-r--r--completion.org9
1 files changed, 6 insertions, 3 deletions
diff --git a/completion.org b/completion.org
index 7a88913..2da8be5 100644
--- a/completion.org
+++ b/completion.org
@@ -27,8 +27,9 @@
company-files
company-dabbrev
company-keywords))
- ;; (company-global-modes '(clojure-mode))
- ;; (company-global-modes t)
+ (company-global-modes '(not slack-message-buffer-mode
+ circe-channel-mode))
+ (company-format-margin-function nil) ;; #'company-text-icons-margin
(company-idle-delay 0.2)
(company-lighter "")
(company-lighter-base "")
@@ -42,7 +43,9 @@
(defun jao-complete-at-point ()
"Complete using company unless we're in the minibuffer."
(interactive)
- (if (window-minibuffer-p) (completion-at-point) (company-manual-begin)))
+ (if (or (not company-mode) (window-minibuffer-p))
+ (completion-at-point)
+ (company-manual-begin)))
(defun jao-company-use-in-tab ()
(global-set-key [remap completion-at-point] #'jao-complete-at-point)