branch: externals/objed
commit 70cf23ee694651e9b6feada6e380318e519b649b
Merge: 2a06126 b6b7c3f
Author: Clemens Radermacher <clem...@posteo.net>
Commit: GitHub <nore...@github.com>
Merge pull request #51 from flatwhatson/fix-company
Disable during a company completion
---
objed.el | 2 ++
1 file changed, 2 insertions(+)
diff --git a/objed.el b/objed.el
index 5531650..d11ff74 100644
--- a/objed.el
+++ b/objed.el
@@ -1299,6 +1299,8 @@ See `objed-cmd-alist'."
(not overriding-terminal-local-map)
;; don't activate when completing the regular Emacs way
(not (get-buffer-window "*Completions*" 0))
+ ;; don't activate during a company completion
+ (not (bound-and-true-p company-candidates))
;; FIXME: temp workaround for starting commit
;; message in insertion mode
(not (eq last-command 'magit-commit-create))
