From 573b4817f3a8563543b236573efa28f84473cf06 Mon Sep 17 00:00:00 2001
From: ndwarshuis <ndwar@yavin4.ch>
Date: Mon, 12 Oct 2020 17:08:40 -0400
Subject: [PATCH] ENH integrate evil mode with undo-tree

---
 etc/conf.org | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/etc/conf.org b/etc/conf.org
index 01f5d91..6911cef 100644
--- a/etc/conf.org
+++ b/etc/conf.org
@@ -775,6 +775,8 @@ Company provides a dropdown of completion options. It has many backends which ar
 I find it weird that most programs do not have a tree-like tool to navigate undo information...because this is literally how most programs store this data.
 
 =undo-tree= package adds a nice undo tree buffer to visualize history and also displays diffs to easily show what changed.
+
+Undo tree is also used by evil mode (see below).
 #+BEGIN_SRC emacs-lisp
 (use-package undo-tree
   :straight t
@@ -3934,9 +3936,12 @@ I like being evil. All package and custom bindings go here.
 (use-package evil
   :straight t
   :init
+  :after undo-tree
   ;; this is required to make evil collection work
   (setq evil-want-integration t
-        evil-want-keybinding nil)
+        evil-want-keybinding nil
+        ;; evil now integrates with undo-tree
+        evil-undo-system 'undo-tree)
   :config
   (evil-mode 1))
 #+END_SRC