dev: merge branch 'master' of github.com:doomemacs

modules/tools/lsp/+lsp.el

@@ -43,6 +43,11 @@ Can be a list of backends; accepts any value `company-backends' accepts.")
   (when (modulep! :config default +bindings)
     (setq lsp-keymap-prefix nil))
 
+  ;; REVIEW: Remove when zigtools/zls#1879 is resolved.
+  (after! lsp-zig
+    (unless (featurep :system 'windows)
+      (setq lsp-zig-download-url-format "https://github.com/zigtools/zls/releases/latest/download/zls-%s-%s.tar.xz")))
+
   :config
   (add-to-list 'doom-debug-variables 'lsp-log-io)
 
@@ -54,10 +59,6 @@ Can be a list of backends; accepts any value `company-backends' accepts.")
         lsp-xml-jar-file (expand-file-name "org.eclipse.lsp4xml-0.3.0-uber.jar" lsp-server-install-dir)
         lsp-groovy-server-file (expand-file-name "groovy-language-server-all.jar" lsp-server-install-dir))
 
-  ;; REVIEW: Remove when zigtools/zls#1879 is resolved.
-  (unless (featurep :system 'windows)
-    (setq lsp-zig-download-url-format "https://github.com/zigtools/zls/releases/latest/download/zls-%s-%s.tar.xz"))
-
   (add-hook! 'doom-escape-hook
     (defun +lsp-signature-stop-maybe-h ()
       "Close the displayed `lsp-signature'."

modules/tools/magit/packages.el

@@ -1,9 +1,9 @@
 ;; -*- no-byte-compile: t; -*-
 ;;; tools/magit/packages.el
 
-(when (package! magit :pin "9d4192b7b12c6b7f0664d99c4f876cfcc0a30ad4")
+(when (package! magit :pin "e77782272082977d56635308b89cf686abd87ef5")
   (when (modulep! +forge)
-    (package! forge :pin "9edfcb2c1528dc7e607daa2d8fa655fc80e0d8b7")
+    (package! forge :pin "21d410c8102422f32db14ddac4eae9e28c2b5c5a")
     (package! code-review
       :recipe (:host github
                :repo "doomelpa/code-review"