emenel/doomemacs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

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

Browse source
This commit is contained in:
Matt Nish-Lapidus 2024-08-23 11:55:16 -04:00
commit 1747a74198
27 changed files with 172 additions and 152 deletions
Download patch file Download diff file Expand all files Collapse all files

3
modules/tools/lsp/+lsp.el
View file

@ -84,6 +84,9 @@ Can be a list of backends; accepts any value `company-backends' accepts.")
:implementations '(lsp-find-implementation :async t)
:type-definition #'lsp-find-type-definition)
;; HACK: See emacs-lsp/lsp-mode#3577
(unless (modulep! :lang terraform)
(setq lsp-client-packages (delete 'lsp-terraform lsp-client-packages)))
(defadvice! +lsp--respect-user-defined-checkers-a (fn &rest args)
"Ensure user-defined `flycheck-checker' isn't overwritten by `lsp'."

8
modules/tools/magit/packages.el
View file

@ -1,12 +1,12 @@
;; -*- no-byte-compile: t; -*-
;;; tools/magit/packages.el
;; NOTE: Always bump this to HEAD~1, not HEAD, because the latest commit on
;; magit's melpa branch is auto-generated and moved to HEAD every time there's
;; a commit to its main branch.
;; NOTE: Always bump magit and forge to HEAD~1, not HEAD, because the latest
;; commit on their melpa branches are auto-generated and moved to HEAD every
;; time there's a commit to its main branch.
(package! magit :pin "2da34f1317c619ec2dfb9e0d969449261ca7f31f")
(when (modulep! +forge)
(package! forge :pin "1e7ee99c7f76034e40210a6fd6007015b1998f6d")
(package! forge :pin "30f181f785522f2debf60945d6b589a65bc415f6")
(package! code-review
:recipe (:host github
:repo "doomelpa/code-review"