diff --git a/modules/emacs/vc/config.el b/modules/emacs/vc/config.el index 64ba695cf..a0a08fcdd 100644 --- a/modules/emacs/vc/config.el +++ b/modules/emacs/vc/config.el @@ -8,13 +8,6 @@ (when IS-WINDOWS (setenv "GIT_ASKPASS" "git-gui--askpass")) -;; Don't complain when these variables are set in file/local vars -(put 'git-commit-major-mode 'safe-local-variable - (lambda (x) - (memq x '(git-commit-elisp-text-mode - text-mode fundamental-mode org-mode markdown-mode)))) -(put 'git-commit-summary-max-length 'safe-local-variable 'numberp) - ;; In case the user is using `bug-reference-mode' (map! :when (fboundp 'bug-reference-mode) :map bug-reference-map diff --git a/modules/tools/magit/packages.el b/modules/tools/magit/packages.el index 96be32ef7..b2732e8d2 100644 --- a/modules/tools/magit/packages.el +++ b/modules/tools/magit/packages.el @@ -1,9 +1,9 @@ ;; -*- no-byte-compile: t; -*- ;;; tools/magit/packages.el -(when (package! magit :pin "1c60edc86512c53b15e753d6dca319a5e01f83a3") +(when (package! magit :pin "4735b9254105eb7dd538f979d8b4c6ab96b827b9") (when (featurep! +forge) - (package! forge :pin "fa80a8789cb15c1b1c5fc7a9e328283202c75135")) + (package! forge :pin "8382fd3d43855de779c46da338dd59b1cb1d333e")) (package! magit-gitflow :pin "cc41b561ec6eea947fe9a176349fb4f771ed865b") (package! magit-todos :pin "78d24cf419138b543460f40509c8c1a168b52ca0") (package! github-review :pin "d0c8234cf523818513f892f30153210606abb6be"))