From 8566cfac7b6fce13daedf63ac609a01999783267 Mon Sep 17 00:00:00 2001
From: Henrik Lissner <henrik@lissner.net>
Date: Sat, 30 Jan 2021 17:57:45 -0500
Subject: [PATCH] Bump evil-collection, vterm

emacs-evil/evil-collection@ffbf149 -> emacs-evil/evil-collection@e6824e2
akermu/emacs-libvterm@101ff86 -> akermu/emacs-libvterm@fb12d7f

Closes #4591

Co-authored-by: Michael Lingelbach <mjlbach@users.noreply.github.com>
---
 modules/editor/evil/packages.el |  2 +-
 modules/term/vterm/autoload.el  | 15 ---------------
 modules/term/vterm/config.el    |  9 +--------
 modules/term/vterm/packages.el  |  2 +-
 4 files changed, 3 insertions(+), 25 deletions(-)

diff --git a/modules/editor/evil/packages.el b/modules/editor/evil/packages.el
index c3176bd60..3e1f17374 100644
--- a/modules/editor/evil/packages.el
+++ b/modules/editor/evil/packages.el
@@ -33,4 +33,4 @@
     (package! neotree)
     (autoload 'neotree-make-executor "neotree" nil nil 'macro))
 
-  (package! evil-collection :pin "ffbf149f0e09d8c2068f9f5098255555d7983696"))
+  (package! evil-collection :pin "e6824e2ad2f2ee7ddccf6f54db655a4cd37a13dc"))
diff --git a/modules/term/vterm/autoload.el b/modules/term/vterm/autoload.el
index 8932b8c68..0ffcbe675 100644
--- a/modules/term/vterm/autoload.el
+++ b/modules/term/vterm/autoload.el
@@ -75,18 +75,3 @@ method to prepare vterm at the corresponding remote directory."
         (vterm-send-string
          (concat "cd " path-localname))
         (vterm-send-return)))))
-
-
-(defvar +vterm--insert-point nil)
-
-;;;###autoload
-(defun +vterm-remember-insert-point-h ()
-  "Remember point when leaving insert mode."
-  (setq-local +vterm--insert-point (point)))
-
-;;;###autoload
-(defun +vterm-goto-insert-point-h ()
-  "Go to the point we were at when we left insert mode."
-  (when +vterm--insert-point
-    (goto-char +vterm--insert-point)
-    (setq-local +vterm--insert-point nil)))
diff --git a/modules/term/vterm/config.el b/modules/term/vterm/config.el
index 9f29dc5bb..d82706cc1 100644
--- a/modules/term/vterm/config.el
+++ b/modules/term/vterm/config.el
@@ -19,11 +19,4 @@
     ;; Don't prompt about dying processes when killing vterm
     confirm-kill-processes nil
     ;; Prevent premature horizontal scrolling
-    hscroll-margin 0)
-
-  ;; Restore the point's location when leaving and re-entering insert mode.
-  (when (featurep! :editor evil)
-    (add-hook! 'vterm-mode-hook
-      (defun +vterm-init-remember-point-h ()
-        (add-hook 'evil-insert-state-exit-hook #'+vterm-remember-insert-point-h nil t)
-        (add-hook 'evil-insert-state-entry-hook #'+vterm-goto-insert-point-h nil t)))))
+    hscroll-margin 0))
diff --git a/modules/term/vterm/packages.el b/modules/term/vterm/packages.el
index b674ee25d..5cd91f5f8 100644
--- a/modules/term/vterm/packages.el
+++ b/modules/term/vterm/packages.el
@@ -3,4 +3,4 @@
 
 (package! vterm
   :built-in 'prefer
-  :pin "101ff86d4d1c7ff8ca954ba59f666fd36f789aae")
+  :pin "fb12d7f49e2da121d9b17ed583d269166e0da087")