diff --git a/Cask b/Cask index 792bc89a2..a0cc0b9a1 100644 --- a/Cask +++ b/Cask @@ -136,6 +136,7 @@ (depends-on "irony-eldoc") (depends-on "flycheck-irony") (depends-on "company-irony") +(depends-on "company-irony-c-headers") ;; Crystal -- modules/module-crystal.el (depends-on "crystal-mode" :git "https://github.com/jpellerin/emacs-crystal-mode") diff --git a/modules/module-cc.el b/modules/module-cc.el index a7bf8b6f2..899e3122a 100644 --- a/modules/module-cc.el +++ b/modules/module-cc.el @@ -82,9 +82,10 @@ (flycheck-irony-setup) (require 'company-irony) - (define-company-backend! c-mode (irony)) - (define-company-backend! c++-mode (irony)) - (define-company-backend! objc-mode (irony)) + (require 'company-irony-c-headers) + (define-company-backend! c-mode (irony-c-headers irony)) + (define-company-backend! c++-mode (irony-c-headers irony)) + (define-company-backend! objc-mode (irony-c-headers irony)) ;; some c-mode dervied modes wrongfully trigger these hooks (like php-mode) (add-hook! (c-mode c++-mode ojbc-mode)