From 88666b19139aa345f83028711bf306aa0aad1b65 Mon Sep 17 00:00:00 2001 From: Henrik Lissner Date: Tue, 13 Aug 2024 23:13:36 -0400 Subject: [PATCH] bump: :lang cc Andersbakken/rtags@bd1c818a993a -> Andersbakken/rtags@f472b5d0a052 chachi/cuda-mode@7f593518fd13 -> chachi/cuda-mode@7dd07a20c36b emacs-lsp/emacs-ccls@8648238a92e5 -> emacs-lsp/emacs-ccls@41399b0eba03 salmanebah/opencl-mode@10ae7742d57a -> salmanebah/opencl-mode@204d5d9e0f5c - An update to cuda-mode now derives it from prog-mode, so that it behaves as a proper major mode (mentioned in #7993). Fix: #7993 --- modules/lang/cc/config.el | 6 +----- modules/lang/cc/packages.el | 8 ++++---- 2 files changed, 5 insertions(+), 9 deletions(-) diff --git a/modules/lang/cc/config.el b/modules/lang/cc/config.el index 067973ddf..76fd6efbe 100644 --- a/modules/lang/cc/config.el +++ b/modules/lang/cc/config.el @@ -255,11 +255,7 @@ If rtags or rdm aren't available, fail silently instead of throwing a breaking e c++-mode-local-vars-hook objc-mode-local-vars-hook cmake-mode-local-vars-hook - ;; HACK Can't use cude-mode-local-vars-hook because cuda-mode - ;; isn't a proper major mode (just a plain function - ;; masquarading as one, so your standard mode hooks won't fire - ;; from switching to cuda-mode). - cuda-mode-hook) + cuda-mode-local-vars-hook) :append #'lsp!) (map! :after ccls diff --git a/modules/lang/cc/packages.el b/modules/lang/cc/packages.el index edd29fec0..544162bc7 100644 --- a/modules/lang/cc/packages.el +++ b/modules/lang/cc/packages.el @@ -4,12 +4,12 @@ (package! cmake-mode :recipe (:host github :repo "emacsmirror/cmake-mode" :files (:defaults "*")) :pin "b08b5d9045308362a623a4f576896d55ffecfd52") -(package! cuda-mode :pin "7f593518fd135fc6af994024bcb47986dfa502d2") +(package! cuda-mode :pin "7dd07a20c36b41c8cb38cdec989673b73d03e144") (package! demangle-mode :pin "04f545adab066708d6151f13da65aaf519f8ac4e") (package! disaster :pin "16bba9afb92aacf06c088c29ba47813b65a80d87") (unless (modulep! +tree-sitter) (package! modern-cpp-font-lock :pin "43c6b68ff58fccdf9deef11674a172e4eaa8455c")) -(package! opencl-mode :pin "10ae7742d57ae79d96cf52753800b3490589b3f6") +(package! opencl-mode :pin "204d5d9e0f5cb2cbe810f2933230eb08fe2c7695") (when (package! glsl-mode :pin "9b2e5f28e489a1f73c4aed734105618ac0dc0c43") (when (modulep! :completion company) @@ -20,7 +20,7 @@ (if (modulep! +lsp) (unless (modulep! :tools lsp +eglot) ;; ccls package is necessary only for lsp-mode. - (package! ccls :pin "8648238a92e5fd1ca1b693c99d2824f8804736b0")) + (package! ccls :pin "41399b0eba03f9b80769ced71501ba702db4cd62")) (when (package! irony :pin "40e0ce19eb850bdf1f77225f11713cc816250d95") (package! irony-eldoc :pin "73e79a89fad982a2ba072f2fcc1b4e41f0aa2978") (when (and (modulep! :checkers syntax) @@ -29,7 +29,7 @@ (when (modulep! :completion company) (package! company-irony :pin "b44711dfce445610c1ffaec4951c6ff3882b216a") (package! company-irony-c-headers :pin "72c386aeb079fb261d9ec02e39211272f76bbd97"))) - (when (package! rtags :pin "bd1c818a993aebdfa22053cdd816ef0e3df7cfa1") + (when (package! rtags :pin "f472b5d0a05270d5c93945b6a71771ab69068147") (when (modulep! :completion ivy) (package! ivy-rtags)) (when (modulep! :completion helm)