From 12a0f8f0caca07bcab2081d26c1c871f0bf41982 Mon Sep 17 00:00:00 2001
From: Amin Bandali <bandali@gnu.org>
Date: Thu, 22 Nov 2018 10:40:50 -0500
Subject: [PATCH 1/1] [emacs/evil] allow evil-integration, but don't use
 undo-tree-mode

using evil-integration resolves issues like paren highlighting in
normal mode when cursor is 'on' the closing paren itself
---
 init.org | 20 ++++++++------------
 1 file changed, 8 insertions(+), 12 deletions(-)

diff --git a/init.org b/init.org
index 1c847ff..ea41e65 100644
--- a/init.org
+++ b/init.org
@@ -716,17 +716,11 @@ customizing it.
 (use-package evil
   :demand t
   ;; :hook (org-src-mode . evil-motion-state)
-  :init
-  (setq evil-want-integration nil)
   :config
   (evil-mode 1)
   (general-swap-key nil '(normal motion) ";" ":")
 
-  (setq
-   evil-want-visual-char-semi-exclusive t
-   evil-move-beyond-eol  t
-   ;; evil-move-cursor-back nil
-   )
+  (setq evil-want-visual-char-semi-exclusive t)
 
   ;; motion state modes
   (dolist (mode '(ebdb-mode
@@ -1254,12 +1248,14 @@ TODO: break this giant source block down into individual org sections.
                (list (regexp-quote (system-name)) nil nil)))
 
 (use-package undo-tree
-  :bind (("C-?" . undo-tree-undo)
-         ("M-_" . undo-tree-redo))
   :config
-  (global-undo-tree-mode)
-  (setq undo-tree-mode-lighter ""
-        undo-tree-auto-save-history t))
+  (global-undo-tree-mode -1))
+  ;; :bind (("C-?" . undo-tree-undo)
+  ;;        ("M-_" . undo-tree-redo))
+  ;; :config
+  ;; (global-undo-tree-mode)
+  ;; (setq undo-tree-mode-lighter ""
+  ;;       undo-tree-auto-save-history t))
 #+end_src
 
 * Editing
-- 
2.20.1