Skip to content

Commit

Permalink
Reverts syl20bnr#16178
Browse files Browse the repository at this point in the history
- Recent PR change ":after files" with deferred loading which doesn't seem to
determinably solve the problem with Emacs 29 of restart-emacs/restart-emacs
colliding with files/restart-emacs (introduced with Emacs 29 with fewer args).

- Switch to ":require files" to ensure it's loaded before the restart-emacs
package, so the restart-emacs/restart-emacs function ovewrites the core function
and not the other way around.

- May be REVERTABLE depending on how upstream copes with this change.

See also: syl20bnr#16185
  • Loading branch information
ViktorHaag committed Nov 8, 2023
1 parent c097162 commit 18c77a2
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion layers/+spacemacs/spacemacs-navigation/packages.el
Original file line number Diff line number Diff line change
Expand Up @@ -356,7 +356,7 @@

(defun spacemacs-navigation/init-restart-emacs ()
(use-package restart-emacs
:defer (spacemacs/defer)
:requires files
:init
(spacemacs/set-leader-keys
"qd" 'spacemacs/restart-emacs-debug-init
Expand Down

0 comments on commit 18c77a2

Please sign in to comment.