Update irony-mode foo

[dotfiles/emacs.git] / config / irony.el

diff --git a/config/irony.el b/config/irony.el
index c00ab4571b5b0f3911de10e4a4a3642b231966bb..3abe2280af02c75ba7eeeef3e4f390b3b60fa872 100644 (file)
--- a/config/irony.el
+++ b/config/irony.el
@@ -1,3 +1,5 @@
+;; cmake -DCMAKE_EXPORT_COMPILE_COMMANDS=ON ..
+
 (if (locate-library "irony")
     (progn
       (require 'irony)
@@ -5,11 +7,10 @@
       (add-hook 'c-mode-hook 'irony-mode)
       (add-hook 'objc-mode-hook 'irony-mode)
 
-      ;; 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)))
+      (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)))