From d62f0088434b32a4bfc582b61d322226058dd1c2 Mon Sep 17 00:00:00 2001
From: Keith Simmons <keith@the-simmons.net>
Date: Sun, 13 Jun 2021 16:10:58 -0700
Subject: [PATCH] fix merge error

---
 src/renderer/cursor_renderer/mod.rs | 2 --
 src/renderer/mod.rs                 | 8 ++------
 2 files changed, 2 insertions(+), 8 deletions(-)

diff --git a/src/renderer/cursor_renderer/mod.rs b/src/renderer/cursor_renderer/mod.rs
index 6d51c46..9466ee6 100644
--- a/src/renderer/cursor_renderer/mod.rs
+++ b/src/renderer/cursor_renderer/mod.rs
@@ -48,7 +48,6 @@ impl Default for CursorSettings {
             animate_in_insert_mode: true,
             animate_command_line: true,
             trail_size: 0.7,
-            distance_length_adjust: false,
             vfx_mode: cursor_vfx::VfxMode::Disabled,
             vfx_opacity: 200.0,
             vfx_particle_lifetime: 1.2,
@@ -229,7 +228,6 @@ impl CursorRenderer {
         font_width: u64,
         font_height: u64,
         windows: &HashMap<u64, RenderedWindow>,
-        current_mode: &EditorMode,
     ) {
         let (cursor_grid_x, cursor_grid_y) = self.cursor.grid_position;
 
diff --git a/src/renderer/mod.rs b/src/renderer/mod.rs
index 572ccc0..d7af543 100644
--- a/src/renderer/mod.rs
+++ b/src/renderer/mod.rs
@@ -332,12 +332,8 @@ impl Renderer {
             .collect();
 
         let windows = &self.rendered_windows;
-        self.cursor_renderer.update_cursor_destination(
-            font_width,
-            font_height,
-            windows,
-            &self.current_mode,
-        );
+        self.cursor_renderer
+            .update_cursor_destination(font_width, font_height, windows);
 
         self.cursor_renderer.draw(
             &self.default_style.colors,