Merge remote-tracking branch 'emacs-exordium/master'

.github/workflows/tests.yml

@@ -1,6 +1,7 @@
 name: CI Tests
 
 on:
+  workflow_dispatch:
   pull_request:
     paths-ignore:
       - '**.md'

init.el

@@ -148,7 +148,8 @@ Each element of the list is in the same form as in `package-pinned-packages'."
   (add-to-list 'package-archives
                (cons "gnu" exordium-gnu-package-repo) t))
 
-(setq package-user-dir (concat "~/.emacs.d/elpa-" emacs-version))
+(setq package-user-dir
+      (locate-user-emacs-file (concat "elpa-" emacs-version)))
 
 (when (fboundp 'native-comp-available-p)
  (setq package-native-compile (native-comp-available-p)))
@@ -180,15 +181,16 @@ Each element of the list is in the same form as in `package-pinned-packages'."
     (update-package pkg has-refreshed)))
 
 ;; - Some packages (i.e., magit, forge) require seq-2.24.
-;; - Emacs-29 is delivered with seq-2.23.
+;; - Emacs-29.1 is delivered with seq-2.23.
 ;; - Other packages (i.e., compat) require seq-2.23.
 ;; - When only magit is installed it requires compat which requires seq-2.23 -> seq is not upgraded
 ;; - When only forge is installed is requires magit and compat which requires seq-2.23 -> seq is not upgraded
 ;; - When magit is installed followed by installation of forge seq is upgraded to seq-2.24 -> this fails
 ;; Force installing the freshest version of seq with errors suppressed:
-(let (debug-on-error)
-  ;; this assumes `package-refresh-contents has been called'
-  (package-install (car (alist-get 'seq package-archive-contents))))
+(when (version< emacs-version "29.2")
+  (let (debug-on-error)
+    ;; this assumes `package-refresh-contents has been called'
+    (package-install (car (alist-get 'seq package-archive-contents)))))
 
 ;;; Path for "require"
 

modules/init-cpp.el

@@ -50,7 +50,14 @@
 ;;; Highlight dead code between "#if 0" and "#endif"
 (add-hook 'c-mode-common-hook 'cpp-highlight-dead-code-hook)
 (when exordium-treesit-modes-enable
-  (add-hook 'c-ts--mode-common-hook 'cpp-highlight-dead-code-hook))
+  (progn
+    (add-hook 'c-ts-mode-hook #'(lambda () (run-hooks 'c-mode-common-hook)))
+    (add-hook 'c++-ts-mode-hook #'(lambda () (run-hooks 'c-mode-common-hook)))
+    (add-to-list 'major-mode-remap-alist '(c-mode . c-ts-mode))
+    (add-to-list 'major-mode-remap-alist '(c++-mode . c++-ts-mode))
+    (add-to-list 'major-mode-remap-alist
+                 '(c-or-c++-mode . c-or-c++-ts-mode))))
+
 
 ;;; Switch between .h <--> .cpp <--> t.cpp