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

Merge pull request #1842 from flatwhatson/undo-tree

Browse source 
Experimental fixes for undo-tree
This commit is contained in:
Henrik Lissner 2019-10-07 16:24:25 -04:00 • committed by GitHub
commit 6ee96d15aa
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 11 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

12
core/core-editor.el
View file

@ -455,11 +455,13 @@ files, so we replace calls to `pp' with the much faster `prin1'."
;; Branching & persistent undo ;; Branching & persistent undo
:after-call doom-switch-buffer-hook after-find-file :after-call doom-switch-buffer-hook after-find-file
:config :config
(setq undo-tree-auto-save-history nil ; disable because unstable (setq undo-tree-auto-save-history t
;; undo-in-region is known to cause undo history corruption, which can ;; Increase undo-limits by a factor of ten to avoid emacs prematurely
;; be very destructive! Disabling it deters the error, but does not fix ;; truncating the undo history and corrupting the tree. See
;; it entirely! ;; https://github.com/syl20bnr/spacemacs/issues/12110
undo-tree-enable-undo-in-region nil undo-limit 800000
undo-strong-limit 12000000
undo-outer-limit 120000000
undo-tree-history-directory-alist undo-tree-history-directory-alist
`(("." . ,(concat doom-cache-dir "undo-tree-hist/")))) `(("." . ,(concat doom-cache-dir "undo-tree-hist/"))))

5
core/packages.el
View file

@ -32,7 +32,10 @@
;; potato. ;; potato.
:recipe (:host github :repo "hlissner/emacs-so-long")) :recipe (:host github :repo "hlissner/emacs-so-long"))
(package! osx-clipboard :ignore (not IS-MAC)) (package! osx-clipboard :ignore (not IS-MAC))
(package! undo-tree) (package! undo-tree
;; NOTE The version of undo-tree published to ELPA is over 5 years old and
;; missing some fixes. Just use the maintainer's repo directly.
:recipe (:host nil :repo "http://www.dr-qubit.org/git/undo-tree.git"))
(package! ws-butler) (package! ws-butler)
(package! xclip :ignore (not IS-LINUX)) (package! xclip :ignore (not IS-LINUX))