Merge pull request #1207 from shanavas786/use-config-names

Use configured variables for rtags binary names

modules/lang/cc/autoload.el

@@ -106,7 +106,7 @@ simpler."
   ;; first rtag
   (when (and (featurep 'rtags)
              rtags-enabled
-             (executable-find "rc"))
+             (executable-find rtags-rc-binary-name))
     (with-temp-buffer
       (message "Reloaded compile commands for rtags daemon")
       (rtags-call-rc :silent t "-J" (or (doom-project-root) default-directory))))

modules/lang/cc/config.el

@@ -191,7 +191,8 @@ compilation database is present in the project.")
   (defun +cc|init-rtags ()
     "Start an rtags server in c-mode and c++-mode buffers."
     (when (and (memq major-mode '(c-mode c++-mode))
-               (rtags-executable-find "rdm"))
+               (require 'rtags nil t)
+               (rtags-executable-find rtags-rdm-binary-name))
       (rtags-start-process-unless-running)))
   (add-hook 'c-mode-common-hook #'+cc|init-rtags)
   :config

modules/lang/cc/doctor.el

@@ -1,10 +1,11 @@
 ;; -*- lexical-binding: t; no-byte-compile: t; -*-
 ;;; lang/cc/doctor.el
 
-;; rtags
-(let ((bins (cl-remove-if #'executable-find '("rdm" "rc"))))
-  (when (/= (length bins) 0)
-    (warn! "Couldn't find the rtag client and/or server programs %s. Disabling rtags support" bins)))
+(when (require 'rtags nil t)
+  ;; rtags
+  (let ((bins (cl-remove-if #'executable-find `(,rtags-rdm-binary-name ,rtags-rc-binary-name))))
+    (when (/= (length bins) 0)
+      (warn! "Couldn't find the rtag client and/or server programs %s. Disabling rtags support" bins))))
 
 ;; irony server
 (when (require 'irony nil t)