From f25ec72253574230d0bb15eddf3a372366b62b21 Mon Sep 17 00:00:00 2001 From: Henrik Lissner Date: Wed, 24 Jul 2019 15:25:42 +0200 Subject: [PATCH] lang/cc: fix stringp errors when loading rtags Binary checks for rtags expect rtags-rc-binary-name and rtags-rdm-binary-name to always be non-nil. --- modules/lang/cc/config.el | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/modules/lang/cc/config.el b/modules/lang/cc/config.el index a05ddcb9c..7ff31ee7a 100644 --- a/modules/lang/cc/config.el +++ b/modules/lang/cc/config.el @@ -197,9 +197,11 @@ This is ignored by ccls.") ('default)) ;; These executables are named rtags-* on debian rtags-rc-binary-name - (cl-find-if #'executable-find (list rtags-rc-binary-name "rtags-rc")) + (or (cl-find-if #'executable-find (list rtags-rc-binary-name "rtags-rc")) + rtags-rc-binary-name) rtags-rdm-binary-name - (cl-find-if #'executable-find (list rtags-rdm-binary-name "rtags-rdm")) + (or (cl-find-if #'executable-find (list rtags-rdm-binary-name "rtags-rdm")) + rtags-rdm-binary-name) ;; If not using ivy or helm to view results, use a pop-up window rather ;; than displaying it in the current window... rtags-results-buffer-other-window t