From 494c702ab6b45def3045812cb618739e4cf9687b Mon Sep 17 00:00:00 2001
From: Humza Shahid <humzasaur@gmail.com>
Date: Sun, 7 Sep 2025 23:06:52 +0100
Subject: [PATCH] add commends to clarify 'removeChr' logic.

---
 fcore/normal-mode/make-normal-delete.sml | 25 +++++++++++-------------
 1 file changed, 11 insertions(+), 14 deletions(-)

diff --git a/fcore/normal-mode/make-normal-delete.sml b/fcore/normal-mode/make-normal-delete.sml
index 0877053..56a2973 100644
--- a/fcore/normal-mode/make-normal-delete.sml
+++ b/fcore/normal-mode/make-normal-delete.sml
@@ -8,19 +8,18 @@ struct
   open AppType
   open MailboxType
 
-  fun finishAfterDeletingBuffer (app: app_type, low, buffer, time, initialMsg) =
+  fun finishAfterDeletingBuffer (app: app_type, low, buffer, time, msgs) =
     let
       val searchString = #searchString app
       val buffer = LineGap.goToStart buffer
-      val msgs = SEARCH (buffer, searchString, time) :: initialMsg
+      val msgs = SEARCH (buffer, searchString, time) :: msgs
 
       val buffer = LineGap.goToIdx (low - 1111, buffer)
       val searchList = SearchList.buildRange (buffer, searchString, low + 1111)
 
       val buffer = LineGap.goToIdx (low, buffer)
     in
-      NormalFinish.buildTextAndClear
-        (app, buffer, low, searchList, initialMsg, time)
+      NormalFinish.buildTextAndClear (app, buffer, low, searchList, msgs, time)
     end
 
   fun deleteAndFinish (app: app_type, low, length, buffer, time) =
@@ -91,23 +90,21 @@ struct
   fun removeChr (app: app_type, count, time) =
     let
       val {buffer, cursorIdx, ...} = app
-
       val buffer = LineGap.goToIdx (cursorIdx, buffer)
-      val lineStart = Cursor.vi0 (buffer, cursorIdx)
-      val lineEnd = Cursor.viDlr (buffer, cursorIdx, 1)
-
-      val buffer = LineGap.goToIdx (lineEnd, buffer)
     in
-      if
-        cursorIdx = lineEnd
-        andalso Cursor.isCursorAtStartOfLine (buffer, lineEnd)
-      then
+      if Cursor.isCursorAtStartOfLine (buffer, cursorIdx) then
         NormalFinish.clearMode app
       else
         let
+          val lineStart = Cursor.vi0 (buffer, cursorIdx)
           val lineEnd = Cursor.viDlrForDelete (buffer, cursorIdx, 1)
+          val buffer = LineGap.goToIdx (lineEnd, buffer)
+
+          (* if specified length (cursorIdx + count) extends 
+           * beyond current line's length,
+          *  then clip the length, to ensure we don't delete the newline *)
           val high = cursorIdx + count
-          val high = Int.min (lineEnd, high)
+          val high = Int.min (lineEnd - 1, high)
           val length = high - cursorIdx
 
           val initialMsg = Fn.initMsgs (cursorIdx, length, buffer)