From dcdd6d98d1d72e4429387f5b619ce5cc21919722 Mon Sep 17 00:00:00 2001 From: daa84 Date: Fri, 13 Oct 2017 12:04:40 +0300 Subject: [PATCH] Ignore mappings in paste code (#14) --- src/shell.rs | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/src/shell.rs b/src/shell.rs index fef15a2..bebc030 100644 --- a/src/shell.rs +++ b/src/shell.rs @@ -332,13 +332,14 @@ impl State { fn edit_paste(&self, clipboard: &str) { let nvim = self.nvim(); if let Some(mut nvim) = nvim { - let paste_code = if self.mode.is(&mode::NvimMode::Normal) { - format!("\"{}p", clipboard) + if self.mode.is(&mode::NvimMode::Insert) || self.mode.is(&mode::NvimMode::Normal) { + let paste_code = format!("normal! \"{}p", clipboard); + nvim.command(&paste_code).report_err(&mut *nvim); } else { - format!("{}", clipboard) + let paste_code = format!("{}", clipboard); + nvim.input(&paste_code).report_err(&mut *nvim); }; - nvim.input(&paste_code).report_err(&mut *nvim); } } }