tweak: prefer built-in cmake-ts-mode

abougouffa · Jun 23, 2023 · 3839539 · 3839539
1 parent da579e7
commit 3839539
Show file tree

Hide file tree

Showing 2 changed files with 31 additions and 5 deletions.
diff --git a/modules/me-prog.el b/modules/me-prog.el
@@ -304,11 +304,14 @@ the children of class at point."
   :straight t
   :mode "\\.vim\\(rc\\)?\\'")
 
-(when (+emacs-features-p 'tree-sitter)
-  (use-package cmake-ts-mode
-    :straight (:type built-in)
-    :mode "CMakeLists\\.txt\\'"
-    :mode "\\.cmake\\'"))
+(unless (+emacs-features-p 'tree-sitter)
+  (+load minemacs-modules-dir "obsolete/me-cmake.el"))
+
+(use-package cmake-ts-mode
+  :straight (:type built-in)
+  :when (+emacs-features-p 'tree-sitter)
+  :mode "CMakeLists\\.txt\\'"
+  :mode "\\.cmake\\'")
 
 (use-package rust-mode
   :straight t

diff --git a/modules/obsolete/me-cmake.el b/modules/obsolete/me-cmake.el
@@ -0,0 +1,23 @@
+;;; me-cmake.el --- Edit CMake files -*- lexical-binding: t; -*-
+
+;; Copyright (C) 2022-2023  Abdelhak Bougouffa
+
+;; Author: Abdelhak Bougouffa (concat "abougouffa" "@" "fedora" "project" "." "org")
+
+;;; Commentary:
+
+;;; Code:
+
+(use-package cmake-mode
+  :straight (:host github :repo "emacsmirror/cmake-mode" :files (:defaults "*"))
+  :mode "CMakeLists\\.txt\\'"
+  :mode "\\.cmake\\'")
+
+(use-package cmake-font-lock
+  :straight (:host github :repo "Lindydancer/cmake-font-lock" :files (:defaults "*"))
+  :hook (cmake-mode . cmake-font-lock-activate))
+
+
+(provide 'obsolete/me-cmake)
+
+;;; me-cmake.el ends here