diff options
| author | Ravi R Kiran <aine.marina@gmail.com> | 2018-05-29 02:06:28 (GMT) |
|---|---|---|
| committer | Ravi R Kiran <aine.marina@gmail.com> | 2018-05-29 02:06:28 (GMT) |
| commit | 31fd6a4eedcd3d98c1e0948b9d63bc3d98819ed2 (patch) | |
| tree | 61c3bf96981760e6e7cd5c55565deb2d9fc22ee0 /lisp | |
| parent | 15370f8a0db076fd104b85f7a4963c1c6156699b (diff) | |
| download | dotemacs-31fd6a4eedcd3d98c1e0948b9d63bc3d98819ed2.zip dotemacs-31fd6a4eedcd3d98c1e0948b9d63bc3d98819ed2.tar.gz dotemacs-31fd6a4eedcd3d98c1e0948b9d63bc3d98819ed2.tar.bz2 | |
Company c headers must be set after rtags
Diffstat (limited to 'lisp')
| -rw-r--r-- | lisp/ravi-init-cpp.el | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/lisp/ravi-init-cpp.el b/lisp/ravi-init-cpp.el index 653cd5e..a0c3c9c 100644 --- a/lisp/ravi-init-cpp.el +++ b/lisp/ravi-init-cpp.el @@ -486,8 +486,6 @@ this to 3 makes header-protection define KIG_MISC_NEWTYPE_H for a file named (setq rtags-path (ravi/emacs-file "site-lisp/rtags/bin")) (setq rtags-autostart-diagnostics t) (setq rtags-completions-enabled t) - (add-hook 'c-mode-hook 'rtags-start-process-unless-running) - (add-hook 'c++-mode-hook 'rtags-start-process-unless-running) (when ravi/use-helm-instead-of-ido (setq rtags-display-result-backend 'helm)) @@ -524,7 +522,13 @@ this to 3 makes header-protection define KIG_MISC_NEWTYPE_H for a file named (when user-dirs (make-local-variable 'company-c-headers-path-system) (setq company-c-headers-path-system (-concat user-dirs company-c-headers-path-system))))))) - (add-hook 'c++-mode-hook 'ravi/set-company-c-headers-paths-from-rtags) + + (defun ravi/rtags-add-hook () + (rtags-start-process-unless-running) + ;; Set company C headers from rtags only after rtags starts running + (ravi/set-company-c-headers-paths-from-rtags)) + (add-hook 'c-mode-hook 'ravi/rtags-add-hook) + (add-hook 'c++-mode-hook 'ravi/rtags-add-hook) (use-package company-rtags :config |