vterm-yank make sure yank at the right position and use vterm-insert

1 files changed, 6 insertions, 6 deletions

diff --git a/vterm.el b/vterm.el
index ea0cedf..acbd502 100644
--- a/vterm.el
+++ b/vterm.el
@@ -918,18 +918,18 @@ prefix argument ARG or with \\[universal-argument]."
 
 Argument ARG is passed to `yank'."
   (interactive "P")
+  (vterm-goto-char (point))
   (let ((inhibit-read-only t))
-    (cl-letf (((symbol-function 'insert-for-yank)
-               #'(lambda (str) (vterm-send-string str t))))
+    (cl-letf (((symbol-function 'insert) #'vterm-insert))
       (yank arg))))
 
 (defun vterm-yank-primary ()
   "Yank text from the primary selection in vterm."
   (interactive)
+  (vterm-goto-char (point))
   (let ((inhibit-read-only t)
         (primary (gui-get-primary-selection)))
-    (cl-letf (((symbol-function 'insert-for-yank)
-               #'(lambda (str) (vterm-send-string str t))))
+    (cl-letf (((symbol-function 'insert) #'vterm-insert))
       (insert-for-yank primary))))
 
 (defun vterm-yank-pop (&optional arg)
@@ -937,10 +937,10 @@ Argument ARG is passed to `yank'."
 
 Argument ARG is passed to `yank'"
   (interactive "p")
+  (vterm-goto-char (point))
   (let ((inhibit-read-only t)
         (yank-undo-function #'(lambda (_start _end) (vterm-undo))))
-    (cl-letf (((symbol-function 'insert-for-yank)
-               #'(lambda (str) (vterm-send-string str t))))
+    (cl-letf (((symbol-function 'insert) #'vterm-insert))
       (yank-pop arg))))
 
 (defun vterm-send-string (string &optional paste-p)