From c621e115da6f4fcbde22f9a9c0fa9454d46f79d8 Mon Sep 17 00:00:00 2001
From: Christopher James Hayward <chris@chrishayward.xyz>
Date: Fri, 26 Feb 2021 15:00:34 -0500
Subject: [PATCH] Fix structure templates C/C++

---
 README.org          | 16 ++++++++++------
 modules/projects.el |  5 +++--
 2 files changed, 13 insertions(+), 8 deletions(-)

diff --git a/README.org b/README.org
index 0e0c9b2..1f4091b 100644
--- a/README.org
+++ b/README.org
@@ -1281,19 +1281,23 @@ Instead of the popular =restclient= package, I use [[https://github.com/zweifisc
 #+ATTR_LATEX: :width 420px
 [[./docs/images/2021-02-13-example-ccls.gif]]
 
-Install the [[https://github.com/MaskRay/ccls][ccls]] language server, and create a new structure templates for C/C++:
-
-+ ~<cc~ for C
-+ ~<cpp~ for C++
+Add support for C/C++ languages.
 
++ Configure the [[https://github.com/MaskRay/ccls][ccls]] language server
++ Load babel language modules for C/C++
++ Create a new structure templates for C/C++
+  - ~<cc~ for C
+  - ~<cpp~ for C++
+    
 #+begin_src emacs-lisp
 (use-package ccls
   :hook ((c-mode c++-mode objc-mode cuda-mode) .
          (lambda ()
            (require 'ccls)
            (lsp-deferred)))
-  :config (add-to-list 'org-structure-template-alist '("cc" . "src cc"))
-          (add-to-list 'org-structure-template-alist '("cpp" . "src cpp")))
+  :config (add-to-list 'org-structure-template-alist '("cc" . "src C"))
+          (add-to-list 'org-structure-template-alist '("cpp" . "src C++"))
+          (org-babel-do-load-languages 'org-babel-load-languages '((C . t))))
 #+end_src
 
 **** Python
diff --git a/modules/projects.el b/modules/projects.el
index c39ff81..e7f1f24 100644
--- a/modules/projects.el
+++ b/modules/projects.el
@@ -63,8 +63,9 @@
          (lambda ()
            (require 'ccls)
            (lsp-deferred)))
-  :config (add-to-list 'org-structure-template-alist '("cc" . "src cc"))
-          (add-to-list 'org-structure-template-alist '("cpp" . "src cpp")))
+  :config (add-to-list 'org-structure-template-alist '("cc" . "src C"))
+          (add-to-list 'org-structure-template-alist '("cpp" . "src C++"))
+          (org-babel-do-load-languages 'org-babel-load-languages '((C . t))))
 
 (use-package python-mode
   :hook (python-mode . lsp-deferred)