diff --git a/fcore/app-update.sml b/fcore/app-update.sml index 359c787..359d5af 100644 --- a/fcore/app-update.sml +++ b/fcore/app-update.sml @@ -805,12 +805,8 @@ struct | #"W" => deleteByDfa (app, count, Cursor.nextWORD) | #"b" => deleteByDfa (app, count, Cursor.prevWord) | #"B" => deleteByDfa (app, count, Cursor.prevWORD) - - (* todo: fix as 'plusOne' needs reimplementing - | #"e" => deleteByDfa (app, count, Cursor.endOfWordPlusOne) - | #"E" => deleteByDfa (app, count, Cursor.endOfWORDPlusOne) - *) - + | #"e" => deleteByDfa (app, count, Cursor.endOfWord) + | #"E" => deleteByDfa (app, count, Cursor.endOfWORD) | #"0" => delete (app, 1, Cursor.vi0) | #"$" => deleteToEndOfLine app | #"^" => deleteToFirstNonSpaceChr app diff --git a/fcore/cursor.sml b/fcore/cursor.sml index 76d8648..8373d49 100644 --- a/fcore/cursor.sml +++ b/fcore/cursor.sml @@ -733,17 +733,6 @@ struct (* equivalent of vi's `E` command *) val endOfWORD = ViWORDDfa.endOfCurrentWORD - (* vi's 'e' command takes user last char in word - * but 'de' deletes up to and including last char of word - * So we need to increment by one for deletion. *) - fun endOfWordPlusOne (lineGap, cursorIdx) = - (* todo: fix *) - endOfWord (lineGap, cursorIdx, 1) + 1 - - fun endOfWORDPlusOne (lineGap, cursorIdx) = - (* todo: fix *) - endOfWORD (lineGap, cursorIdx, 1) + 1 - fun helpFirstNonSpaceChr (strPos, str, absIdx, stl, ltl) = if strPos = String.size str then case (stl, ltl) of