From 1adb74df2cabaaf89ea717542b2b17f4f28612f9 Mon Sep 17 00:00:00 2001 From: Humza Shahid Date: Tue, 16 Sep 2025 22:20:55 +0100 Subject: [PATCH] pull in new brolib-sml changes (which just changes one particular function's name to be clearer), and modify code to use the correct name --- fcore/normal-mode/normal-finish.sml | 4 ++-- fcore/normal-mode/normal-move.sml | 4 ++-- fcore/normal-mode/normal-search-finish.sml | 4 ++-- lib/brolib-sml | 2 +- 4 files changed, 7 insertions(+), 7 deletions(-) diff --git a/fcore/normal-mode/normal-finish.sml b/fcore/normal-mode/normal-finish.sml index b1a0262..c5b0fe6 100644 --- a/fcore/normal-mode/normal-finish.sml +++ b/fcore/normal-mode/normal-finish.sml @@ -27,7 +27,7 @@ struct TextScroll.getScrollColumn (buffer, cursorIdx, windowWidth, prevScrollColumn) - val cursorLine = LineGap.getLineNumberOfIdx (cursorIdx, buffer) + val cursorLine = LineGap.idxToLineNumber (cursorIdx, buffer) val startLine = TextScroll.getStartLine (prevLineNumber, cursorLine, windowHeight) @@ -144,7 +144,7 @@ struct } = app val buffer = LineGap.goToIdx (cursorIdx, buffer) - val cursorLine = LineGap.getLineNumberOfIdx (cursorIdx, buffer) + val cursorLine = LineGap.idxToLineNumber (cursorIdx, buffer) val startLine = TextScroll.getLineCentre (cursorLine, windowHeight) val buffer = LineGap.goToLine (startLine, buffer) diff --git a/fcore/normal-mode/normal-move.sml b/fcore/normal-mode/normal-move.sml index 478d916..7feacd8 100644 --- a/fcore/normal-mode/normal-move.sml +++ b/fcore/normal-mode/normal-move.sml @@ -135,7 +135,7 @@ struct TextScroll.getScrollColumn (buffer, cursorIdx, windowWidth, prevScrollColumn) - val cursorLine = LineGap.getLineNumberOfIdx (cursorIdx, buffer) + val cursorLine = LineGap.idxToLineNumber (cursorIdx, buffer) val startLine = TextScroll.getStartLine (prevLineNumber, cursorLine, windowHeight) @@ -196,7 +196,7 @@ struct TextScroll.getScrollColumn (buffer, cursorIdx, windowWidth, prevScrollColumn) - val cursorLine = LineGap.getLineNumberOfIdx (cursorIdx, buffer) + val cursorLine = LineGap.idxToLineNumber (cursorIdx, buffer) val startLine = TextScroll.getStartLine (prevLineNumber, cursorLine, windowHeight) diff --git a/fcore/normal-mode/normal-search-finish.sml b/fcore/normal-mode/normal-search-finish.sml index a5e38b1..96ab5e0 100644 --- a/fcore/normal-mode/normal-search-finish.sml +++ b/fcore/normal-mode/normal-search-finish.sml @@ -50,7 +50,7 @@ struct ) val buffer = LineGap.goToIdx (cursorIdx, buffer) - val cursorLine = LineGap.getLineNumberOfIdx (cursorIdx, buffer) + val cursorLine = LineGap.idxToLineNumber (cursorIdx, buffer) val startLine = TextScroll.getStartLine (prevLineNumber, cursorLine, windowHeight) val buffer = LineGap.goToLine (startLine, buffer) @@ -120,7 +120,7 @@ struct ) val buffer = LineGap.goToIdx (cursorIdx, buffer) - val cursorLine = LineGap.getLineNumberOfIdx (cursorIdx, buffer) + val cursorLine = LineGap.idxToLineNumber (cursorIdx, buffer) val startLine = TextScroll.getStartLine (prevLineNumber, cursorLine, newWindowHeight) val buffer = LineGap.goToLine (startLine, buffer) diff --git a/lib/brolib-sml b/lib/brolib-sml index bef4620..749a0d0 160000 --- a/lib/brolib-sml +++ b/lib/brolib-sml @@ -1 +1 @@ -Subproject commit bef4620cdb3f6d98b9d79afc8d7339052c9bc78e +Subproject commit 749a0d0e5f9d0f06135994c396c79bd1f56352b8