--- a/EditTextView.st	Fri Oct 26 11:03:54 2018 +0200
+++ b/EditTextView.st	Fri Oct 26 18:36:36 2018 +0200
@@ -4098,7 +4098,7 @@
         lastLine := list size.
         finished := false.
         [finished] whileFalse:[
-            (lastLine <= 1) ifTrue:[
+            ((lastLine <= 1) or:[lastLine = cursorLine]) ifTrue:[
                 finished := true
             ] ifFalse:[
                 line := list at:lastLine.
@@ -4120,6 +4120,8 @@
             "/ self textChanged
         ]
     ].
+
+    "Modified: / 26-10-2018 / 18:22:26 / Claus Gittinger"
 !
 
 replace:aCharacter atLine:lineNr col:colNr
@@ -4721,7 +4723,7 @@
 
     self st80EditMode ifFalse:[
         (self trimBlankLines
-        and:[colNr > lineSize
+        and:[colNr > (lineSize + 1)
         and:[aCharacter == Character space]]) ifTrue:[
             ^ self
         ]
@@ -4810,7 +4812,7 @@
     ]
 
     "Modified: / 09-11-2010 / 13:43:18 / cg"
-    "Modified: / 22-08-2018 / 09:03:58 / Claus Gittinger"
+    "Modified: / 26-10-2018 / 18:18:17 / Claus Gittinger"
 !
 
 basicListAt:lineNr put:newLine
@@ -4885,7 +4887,7 @@
     lineSize := line size.
 
     (self trimBlankLines
-    and:[colNr > lineSize
+    and:[colNr > (lineSize + 1)
     and:[aCharacter == Character space]]) ifTrue:[
         ^ self
     ].
@@ -4925,6 +4927,7 @@
 
     "Created: / 06-03-1996 / 12:29:20 / cg"
     "Modified: / 09-11-2010 / 13:42:54 / cg"
+    "Modified: / 26-10-2018 / 18:21:21 / Claus Gittinger"
 !
 
 basicReplaceString:aString atLine:lineNr col:colNr