X-Git-Url: https://git.siccegge.de//index.cgi?a=blobdiff_plain;ds=sidebyside;f=config%2Firony.el;h=3abe2280af02c75ba7eeeef3e4f390b3b60fa872;hb=64ae6b441963a7b54d4fe15cd304757d75ffdb0c;hp=95b6c488aa8e7bbaec68d8e85e85a078963b033f;hpb=27c85285f89b94bef7ba54c9b11da587941a6a7c;p=dotfiles%2Femacs.git

diff --git a/config/irony.el b/config/irony.el
index 95b6c48..3abe228 100644
--- a/config/irony.el
+++ b/config/irony.el
@@ -1,13 +1,16 @@
-(require 'irony)
-(add-hook 'c++-mode-hook 'irony-mode)
-(add-hook 'c-mode-hook 'irony-mode)
-(add-hook 'objc-mode-hook 'irony-mode)
+;; cmake -DCMAKE_EXPORT_COMPILE_COMMANDS=ON ..
 
-;; replace the `completion-at-point' and `complete-symbol' bindings in
-;; irony-mode's buffers by irony-mode's function
-(defun my-irony-mode-hook ()
-  (define-key irony-mode-map [remap completion-at-point]
-    'irony-completion-at-point-async)
-  (define-key irony-mode-map [remap complete-symbol]
-    'irony-completion-at-point-async))
-(add-hook 'irony-mode-hook 'my-irony-mode-hook)
+(if (locate-library "irony")
+    (progn
+      (require 'irony)
+      (add-hook 'c++-mode-hook 'irony-mode)
+      (add-hook 'c-mode-hook 'irony-mode)
+      (add-hook 'objc-mode-hook 'irony-mode)
+
+      (add-hook 'c++-mode-hook 'company-mode)
+      (add-hook 'c-mode-hook 'company-mode)
+      (add-hook 'objc-mode-hook 'company-mode)
+
+      (eval-after-load 'company
+        '(add-to-list 'company-backends 'company-irony))
+      (add-hook 'irony-mode-hook 'irony-cdb-autosetup-compile-options)))