--- a/EditTextView.st	Fri May 13 20:20:00 2016 +0200
+++ b/EditTextView.st	Sun May 15 06:58:45 2016 +0200
@@ -2983,8 +2983,9 @@
                     self st80EditMode ifTrue:[
                         "/ ensure that there is no conflict here: st80EditMode will
                         "/ not allow a cursor position beyond the end of line,
-                        "/ so avoid that cursorLine:col: will force us to the beginning of the line
+                        "/ so ensure that cursorLine:col: will force us to the beginning of the line
                         originalLine size < prevTab ifTrue:[
+                            self checkForExistingLine:cursorLine.    
                             self basicListAt:cursorLine put:ln
                         ]
                     ].
@@ -4802,7 +4803,7 @@
                         self cursorLine:clickLine col:newCursorCol makeVisible:false.
                         Processor 
                             addTimedBlock:[self sensor pushUserEvent:#makeCursorVisible for:self]
-                            afterSeconds:0.3.
+                            after:0.3 seconds.
                     ] ifFalse:[
                         self cursorLine:clickLine col:newCursorCol.
                     ].

--- a/GenericToolbarIconLibrary.st	Fri May 13 20:20:00 2016 +0200
+++ b/GenericToolbarIconLibrary.st	Sun May 15 06:58:45 2016 +0200
@@ -4827,6 +4827,31 @@
         ifAbsentPut:[(Depth2Image width:16 height:16) bits:(ByteArray fromPackedString:'@@@@@AUUUUPZ**UTEUUUUAZ*)UPUUUUTE**)UAUUUUPUU?=TEUUUUAUW?5PUUUUTE***UAUUUUPUUUUT@@@@@@@a') colorMapFromArray:#[0 0 0 255 255 255 140 247 115 255 0 0]; yourself]
 !
 
+smalllintError16x16
+    "This resource specification was automatically generated
+     by the ImageEditor of ST/X."
+
+    "Do not manually edit this!! If it is corrupted,
+     the ImageEditor may not be able to read the specification."
+
+    "
+     self smalllintError16x16 inspect
+     ImageEditor openOnClass:self andSelector:#smalllintError16x16
+     Icon flushCachedIcons
+    "
+
+    <resource: #image>
+
+    ^Icon
+        constantNamed:'GenericToolbarIconLibrary smalllintError16x16'
+        ifAbsentPut:[(Depth8Image width:16 height:16) bits:(ByteArray fromPackedString:'
+@@@@@@@@@@@@@@@@@@@@@@@@@@DA@PDA@@@@@@@@@@@@@@DB@0PC@ D@@@@@@@@@@@DBAPTEAPTE@P@@@@@@@@@AA0TRA!!HEA0D@@@@@@@@@@P$EA XFAP0A
+@PD@@@@@@@DIAQHFD TIC1@Q@P@@@@@@D!!LEAPTSD!!@UD@D@@@@@@@DVE0TXE <YF!!$O@P@@@@@@@Q,\GPDPFQ(YD@D@@@@@@@D^@Q< HQ$"FRD @P@@@@@A
+H2P%DA$&F"XYD@D@@@@@@R\(JR(+KB4,J2(A@@@@@@@A@PD.J"(*J"(.@@@@@@@@@@@@@PDA@PDA@P@@@@@@@@@@@@@@@@@@@@@@@@@a')
+            colorMapFromArray:#[0 0 0 255 248 252 240 96 99 239 56 60 239 64 71 240 101 96 255 182 176 239 60 56 255 177 168 240 67 56 255 190 176 255 205 200 239 68 56 255 240 241 255 228 224 239 136 145 224 88 102 239 160 170 255 141 136 240 89 64 255 195 184 255 218 208 255 144 128 255 107 96 255 94 88 255 136 128 80 0 11 191 123 120 207 229 240 176 133 120 128 208 197 80 136 133 224 120 130 239 101 96 208 56 56 128 184 173 176 181 184 95 136 134 239 120 123 176 200 193 79 120 118 200 200 208 207 48 69 255 154 144 240 150 136 176 83 80 224 160 161]
+            mask:((Depth1Image width:16 height:16) bits:(ByteArray fromPackedString:'@@@_@C>@_<A?0G?0_? ?>C?<G?0_?!!?>G?8O?@G<@@@b'); yourself); yourself]
+!
+
 snapshot16x16Icon
     "This resource specification was automatically generated
      by the ImageEditor of ST/X."

--- a/TextView.st	Fri May 13 20:20:00 2016 +0200
+++ b/TextView.st	Sun May 15 06:58:45 2016 +0200
@@ -333,16 +333,16 @@
     ^ Dictionary new addPairsFrom:#(
 
 #matchSearch
-'Search for a pattern (glob) as opposed to a direct string search'
+'Search for a pattern (GLOB) as opposed to a direct string search'
 
 #searchCaseSensitive
 'Care for case differences'
 
 #searchFullWord
-'Search only for full words (ignore occurrences as substring)'
+'Search only for full words (ignore occurrences in substring)'
 
 #searchAtBeginOfLineOnly
-'Search only for the string at the beginning if a line'
+'Search only for the string at the beginning of a line'
 
 #searchPattern
 'String or match-pattern to be searched'
@@ -351,7 +351,7 @@
 'Search only for that variable name (ignore occurrences in other contexts)'
 
 #replaceText
-'If checked, matching text is replaced by this (everywhere)'
+'If checked, matching text is replaced by this'
 
 #selectLines
 'If checked, lines containing the matched string are selected.'
@@ -366,7 +366,7 @@
 'Wrap around at the end of the text, and continue the search from the top'
 
 #matchWithRegex
-'Use regex pattern for search (as opposed to glob pattern)'
+'Use regex pattern for search (as opposed to GLOB pattern)'
 )
 ! !
 
@@ -2246,7 +2246,10 @@
         (modal not
         and:[ searchBox window realized ]) ifTrue:[
             "/ reuse it.
-            searchBox raiseDeiconified.
+            searchBox window 
+                raiseDeiconified;
+                requestFocus;
+                assignKeyboardFocusToFirstKeyboardConsumer.
             ^ self.
         ].    
         searchBox closeRequest.