emenel/doomemacs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

lang/cc: remove +cc|init-rtags-server-maybe

Browse source 
The rtags-start-process-unless-running function does exactly the same
thing, making +cc|init-rtags-server-maybe redundant.

Relevant to #305
This commit is contained in:
Henrik Lissner 2017-12-27 00:49:08 -05:00
parent 854b26af28
commit 0a9a992e81
No known key found for this signature in database
GPG key ID: 5F6C0EA160557395
1 changed files with 2 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

15
modules/lang/cc/config.el
View file

@ -204,27 +204,16 @@ compilation database is present in the project.")
;; ...and don't auto-jump to first match before making a selection. ;; ...and don't auto-jump to first match before making a selection.
rtags-jump-to-first-match nil) rtags-jump-to-first-match nil)
(defun +cc|init-rtags-server-maybe ()
"Start the rtags server if it isn't already running."
(unless (or (processp rtags-rdm-process)
(cl-loop for proc in (list-system-processes)
for cmd = (cdr (assq 'args (process-attributes proc)))
if (string-match-p "/rdm\\_>" cmd)
return t))
(message "Starting rtags server")
(rtags-start-process-unless-running)
;; Emacs-spawned rdm should be temporary
(add-hook! kill-emacs (ignore-errors (rtags-cancel-process)))))
(let ((bins (cl-remove-if-not #'executable-find '("rdm" "rc")))) (let ((bins (cl-remove-if-not #'executable-find '("rdm" "rc"))))
(if (/= (length bins) 2) (if (/= (length bins) 2)
(warn "cc-mode: couldn't find %s, disabling rtags support" bins) (warn "cc-mode: couldn't find %s, disabling rtags support" bins)
(add-hook! (c-mode c++-mode) #'+cc|init-rtags-server-maybe) (add-hook! (c-mode c++-mode) #'rtags-start-process-unless-running)
(set! :jump '(c-mode c++-mode) (set! :jump '(c-mode c++-mode)
:definition #'rtags-find-symbol-at-point :definition #'rtags-find-symbol-at-point
:references #'rtags-find-references-at-point))) :references #'rtags-find-references-at-point)))
(add-hook 'doom-cleanup-hook #'rtags-cancel-process) (add-hook 'doom-cleanup-hook #'rtags-cancel-process)
(add-hook! kill-emacs (ignore-errors (rtags-cancel-process)))
;; Use rtags-imenu instead of imenu/counsel-imenu ;; Use rtags-imenu instead of imenu/counsel-imenu
(map! :map (c-mode-map c++-mode-map) [remap imenu] #'rtags-imenu) (map! :map (c-mode-map c++-mode-map) [remap imenu] #'rtags-imenu)