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

Fix load-order issue for undo-fu-session

Browse source 
Which made it much more difficult to customize undo-fu-session with
merely an `after!` block. See jwiegley/use-package#829 for why this
happens.
This commit is contained in:
Henrik Lissner 2020-04-09 18:19:11 -04:00
parent 5c56c0b218
commit 15ab86848e
No known key found for this signature in database
GPG key ID: 5F6C0EA160557395
1 changed files with 14 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

25
core/core-editor.el
View file

@ -580,19 +580,22 @@ files, so we replace calls to `pp' with the much faster `prin1'."
(use-package! undo-fu-session (use-package! undo-fu-session
:after undo-fu :after undo-fu
:init :preface
(setq undo-fu-session-directory (concat doom-cache-dir "undo-fu-session/") (setq undo-fu-session-directory (concat doom-cache-dir "undo-fu-session/")
undo-fu-session-incompatible-files '("/COMMIT_EDITMSG\\'" "/git-rebase-todo\\'")) undo-fu-session-incompatible-files '("/COMMIT_EDITMSG\\'" "/git-rebase-todo\\'"))
:config ;; HACK We avoid `:config' here because `use-package's `:after' complicates
;; HACK Use the faster zstd to compress undo files instead of gzip ;; the load order of a package's `:config' block and makes it impossible
(when (executable-find "zstd") ;; for the user to override its settings with merely `after!' (or
(defadvice! doom--undo-fu-session-use-zstd-a (filename) ;; `eval-after-load'). See jwiegley/use-package#829.
:filter-return #'undo-fu-session--make-file-name (after! undo-fu-session
(if undo-fu-session-compression ;; HACK Use the faster zstd to compress undo files instead of gzip
(concat (file-name-sans-extension filename) ".zst") (when (executable-find "zstd")
filename))) (defadvice! doom--undo-fu-session-use-zstd-a (filename)
:filter-return #'undo-fu-session--make-file-name
(global-undo-fu-session-mode +1)) (if undo-fu-session-compression
(concat (file-name-sans-extension filename) ".zst")
filename)))
(global-undo-fu-session-mode +1)))
(use-package! ws-butler (use-package! ws-butler