This commit is contained in:
Daniel Ziltener 2023-12-19 10:30:44 +01:00
parent c5f637e923
commit 2c00474de6
Signed by: zilti
GPG key ID: B38976E82C9DAE42
2 changed files with 5 additions and 5 deletions

View file

@ -854,14 +854,15 @@ Point must be at the beginning of balanced expression (sexp)."
;; Magit requires 'transient' >= 0.5.0, but due to bad defaults, Emacs' package manager refuses to ;; Magit requires 'transient' >= 0.5.0, but due to bad defaults, Emacs' package manager refuses to
;; upgrade this and other built-in packages to higher releases from GNU Elpa. ;; upgrade this and other built-in packages to higher releases from GNU Elpa.
(use-package transient
:init
(progn (unload-feature 'transient t)
(require 'transient)))
;; To fix this, you have to add this to your init file: ;; To fix this, you have to add this to your init file:
;; (setq package-install-upgrade-built-in t) ;; (setq package-install-upgrade-built-in t)
;; You must also make sure the updated version is loaded, by evaluating the `progn` form below. ;; You must also make sure the updated version is loaded, by evaluating the `progn` form below.
(use-package magit (use-package magit
:after transient :after transient
:init
(progn (unload-feature 'transient t)
(require 'transient))
:autoload :autoload
magit) magit)

View file

@ -205,5 +205,4 @@
(default-cache-ttl 7200) (default-cache-ttl 7200)
(default-cache-ttl-ssh 7200) (default-cache-ttl-ssh 7200)
(extra-content "grab\nallow-emacs-pinentry\nallow-loopback-pinentry"))) (extra-content "grab\nallow-emacs-pinentry\nallow-loopback-pinentry")))
(service home-dbus-service-type) (service home-dbus-service-type))))
)))