From 1ebc4c9594a39c3ca8a99e9e64aecb52feaf625c Mon Sep 17 00:00:00 2001 From: Henrik Lissner Date: Mon, 1 Jan 2018 13:23:08 -0500 Subject: [PATCH] lang/cc: fix irony-mode complaining in non-C modes, like php-mode --- modules/lang/cc/config.el | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/modules/lang/cc/config.el b/modules/lang/cc/config.el index 369b874cc..f5b61e172 100644 --- a/modules/lang/cc/config.el +++ b/modules/lang/cc/config.el @@ -110,7 +110,11 @@ compilation database is present in the project.") :after cc-mode :commands irony-install-server :preface (setq irony-server-install-prefix (concat doom-etc-dir "irony-server/")) - :hook ((c-mode c++-mode objc-mode) . irony-mode) + :init + (defun +cc|init-irony-mode () + (when (memq major-mode '(c-mode c++-mode objc-mode)) + (irony-mode +1))) + (add-hook! (c-mode c++-mode objc-mode) #'+cc|init-irony-mode) :config (unless (file-directory-p irony-server-install-prefix) (warn "irony-mode: server isn't installed; run M-x irony-install-server"))