From d4ff90219e215a7066bb798a67757b5fdbcaa4bd Mon Sep 17 00:00:00 2001 From: Henrik Lissner Date: Tue, 23 Apr 2019 14:03:16 -0400 Subject: [PATCH] lang/cc: remove +irony and +rtags flags from docs They were removed a while back. Irony and rtags (et co) will be disabled if +lsp is enabled, or can be disabled through package! declarations: ;; in ~/.doom.d/packages.el (package! irony :disable t) (package! rtags :disable t) --- init.example.el | 2 +- modules/lang/cc/README.org | 46 ++++++++++++++++++++------------------ 2 files changed, 25 insertions(+), 23 deletions(-) diff --git a/init.example.el b/init.example.el index f988d0174..c26828d43 100644 --- a/init.example.el +++ b/init.example.el @@ -90,7 +90,7 @@ :lang ;;agda ; types of types of types of types... ;;assembly ; assembly for fun or debugging - ;;(cc +irony +rtags); C/C++/Obj-C madness + ;;cc ; C/C++/Obj-C madness ;;clojure ; java with a lisp ;;common-lisp ; if you've seen one lisp, you've seen them all ;;coq ; proofs-as-programs diff --git a/modules/lang/cc/README.org b/modules/lang/cc/README.org index 8ee278570..4942c4ac9 100644 --- a/modules/lang/cc/README.org +++ b/modules/lang/cc/README.org @@ -4,17 +4,17 @@ #+STARTUP: inlineimages * Table of Contents :TOC_3:noexport: -- [[Description][Description]] - - [[Module Flags][Module Flags]] - - [[Plugins][Plugins]] -- [[Prerequisites][Prerequisites]] - - [[irony-server][irony-server]] - - [[MacOS][MacOS]] - - [[Arch Linux][Arch Linux]] - - [[rtags][rtags]] -- [[Configure][Configure]] - - [[Project compile settings][Project compile settings]] - - [[Known issues with bear on macOS][Known issues with bear on macOS]] +- [[#description][Description]] + - [[#module-flags][Module Flags]] + - [[#plugins][Plugins]] +- [[#prerequisites][Prerequisites]] + - [[#irony-server][irony-server]] + - [[#macos][MacOS]] + - [[#arch-linux][Arch Linux]] + - [[#rtags][rtags]] +- [[#configure][Configure]] + - [[#project-compile-settings][Project compile settings]] + - [[#known-issues-with-bear-on-macos][Known issues with bear on macOS]] * Description This module adds support for the C-family of languages: C, C++, and Objective-C. @@ -28,10 +28,8 @@ This module adds support for the C-family of languages: C, C++, and Objective-C. + Several improvements to C++11 indentation and syntax highlighting. ** Module Flags -+ ~+irony~ Enable Irony as a backend for code completion, syntax checking, and - eldoc support. This must be disabled to use LSP or another backend. -+ ~+rtags~ Enable rtags integration. A daemon will be spawned the first time you - open a C/C++/ObjC buffer, if one hasn't already. ++ ~+lsp~ Disables irony+rtags and replaces them with LSP (ccls by default). This + requires the =:tools lsp= module. ** Plugins + [[https://github.com/Kitware/CMake][cmake-mode]] @@ -42,13 +40,17 @@ This module adds support for the C-family of languages: C, C++, and Objective-C. + [[https://github.com/salmanebah/opencl-mode][opencl-mode]] + [[https://github.com/jimhourihan/glsl-mode][glsl-mode]]* + [[https://github.com/guidoschmidt/company-glsl][gompany-glsl]]* -+ [[https://github.com/Sarcasm/irony-mode][irony]]* -+ [[https://github.com/ikirill/irony-eldoc][irony-eldoc]]* -+ [[https://github.com/Sarcasm/flycheck-irony][flycheck-irony]]* -+ [[https://github.com/Sarcasm/company-irony][company-irony]]* -+ [[https://github.com/hotpxl/company-irony-c-headers][company-irony-c-headers]]* -+ [[https://github.com/Andersbakken/rtags][rtags]]* -+ [[https://github.com/Andersbakken/rtags][ivy-rtags]] or [[https://github.com/Andersbakken/rtags][helm-rtags]]* ++ =+lsp= + + [[https://github.com/MaskRay/emacs-ccls][ccls]] ++ =-lsp= + + [[https://github.com/Sarcasm/irony-mode][irony]] + + [[https://github.com/ikirill/irony-eldoc][irony-eldoc]] + + [[https://github.com/Sarcasm/flycheck-irony][flycheck-irony]] + + [[https://github.com/Sarcasm/company-irony][company-irony]] + + [[https://github.com/hotpxl/company-irony-c-headers][company-irony-c-headers]] + + [[https://github.com/Andersbakken/rtags][rtags]] + + [[https://github.com/Andersbakken/rtags][ivy-rtags]] + + [[https://github.com/Andersbakken/rtags][helm-rtags]] * Prerequisites This module requires