From 503321515049a8890fd48e8823a29f6f2a469753 Mon Sep 17 00:00:00 2001 From: Henrik Lissner Date: Sun, 29 Mar 2020 01:29:27 -0400 Subject: [PATCH] Fix #2789: wrong init hooks for irony & rtags --- modules/lang/cc/config.el | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/modules/lang/cc/config.el b/modules/lang/cc/config.el index 438085637..5bdcdf008 100644 --- a/modules/lang/cc/config.el +++ b/modules/lang/cc/config.el @@ -40,7 +40,7 @@ This is ignored by ccls.") ;; set up before the likes of irony/lsp are initialized. Also, we use ;; local-vars hooks to ensure these only run in their respective major modes, ;; and not their derived modes. - :hook ((after-c-mode after-c++-mode after-objc-mode) . +cc-init-ffap-integration-h) + :hook ((c-mode-local-vars c++-mode-local-vars objc-mode-local-vars) . +cc-init-ffap-integration-h) ;;; Improve fontification in C/C++ (also see `modern-cpp-font-lock') :hook (c-mode-common . rainbow-delimiters-mode) :hook ((c-mode c++-mode) . +cc-fontify-constants-h) @@ -120,7 +120,7 @@ This is ignored by ccls.") :hook (irony-mode . +cc-init-irony-compile-options-h) ;; Only initialize `irony-mode' if the server is available. Otherwise fail ;; quietly and gracefully. - :hook ((after-c-mode after-c++-mode after-objc-mode) . +cc-init-irony-mode-maybe-h) + :hook ((c-mode-local-vars c++-mode-local-vars objc-mode-local-vars) . +cc-init-irony-mode-maybe-h) :preface (setq irony-server-install-prefix (concat doom-etc-dir "irony-server/")) :config (defun +cc-init-irony-mode-maybe-h () @@ -171,7 +171,7 @@ This is ignored by ccls.") (use-package! rtags :unless (featurep! +lsp) ;; Only initialize rtags-mode if rtags and rdm are available. - :hook ((after-c-mode after-c++-mode after-objc-mode) . +cc-init-rtags-maybe-h) + :hook ((c-mode-local-vars c++-mode-local-vars objc-mode-local-vars) . +cc-init-rtags-maybe-h) :preface (setq rtags-install-path (concat doom-etc-dir "rtags/")) :config (defun +cc-init-rtags-maybe-h ()