From 2b81a83337263bcea71953e598b09afbd47c5719 Mon Sep 17 00:00:00 2001 From: Irene Knapp Date: Fri, 27 Mar 2026 17:33:41 -0700 Subject: rename cursor_neutral_column to just neutral_column the longer name was less accurate and unnecessary Force-Push: yes Change-Id: Ic691e0979644935953b79b491388271eb51a5e02 --- src/main.rs | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/src/main.rs b/src/main.rs index ae84e0b..59d3baa 100644 --- a/src/main.rs +++ b/src/main.rs @@ -41,7 +41,7 @@ struct Window { /* The neutral column is the one that vertical movement will attempt to * land in, if it exists in the target row. */ - cursor_neutral_column: RwLock, + neutral_column: RwLock, scroll_top: RwLock, } @@ -423,7 +423,7 @@ impl Ivy { let buffer = self.buffer.write().await; let window = self.window.write().await; let mut column = window.cursor_column.write().await; - let mut neutral_column = window.cursor_neutral_column.write().await; + let mut neutral_column = window.neutral_column.write().await; let row = window.cursor_row.read().await; if let Some(span) = buffer.line_span(*row).await { @@ -449,7 +449,7 @@ impl Ivy { if let Some(span) = buffer.line_span(*row).await { let width = span.end - span.start; - let neutral_column = *window.cursor_neutral_column.read().await; + let neutral_column = *window.neutral_column.read().await; if neutral_column < width { *column = neutral_column; @@ -489,11 +489,11 @@ impl Ivy { let window = self.window.write().await; *window.cursor_column.write().await = offset; - *window.cursor_neutral_column.write().await = offset; + *window.neutral_column.write().await = offset; } else { let window = self.window.write().await; *window.cursor_column.write().await = 0; - *window.cursor_neutral_column.write().await = 0; + *window.neutral_column.write().await = 0; } Ok(()) @@ -629,7 +629,7 @@ impl Window { Window { cursor_row: RwLock::new(0), cursor_column: RwLock::new(0), - cursor_neutral_column: RwLock::new(0), + neutral_column: RwLock::new(0), scroll_top: RwLock::new(0), } } -- cgit 1.4.1