Merge jv
authorJan Vrany <jan.vrany@fit.cvut.cz>
Sun, 09 Aug 2015 07:20:03 +0100
branchjv
changeset 5395 fc9336b15c5c
parent 5389 940dcf5485be (current diff)
parent 5394 bd2329beafbc (diff)
child 5397 f5f018ac89fb
Merge
EditTextView.st
ListView.st
TextView.st
--- a/EditTextView.st	Thu Jul 30 06:49:25 2015 +0200
+++ b/EditTextView.st	Sun Aug 09 07:20:03 2015 +0100
@@ -1325,7 +1325,10 @@
 !
 
 at:lineNr put:aLine
-    (self at:lineNr) = aLine ifFalse:[
+    |oldLine|
+
+    oldLine := (self at:lineNr) ? ''.
+    (oldLine sameStringAndEmphasisAs: (aLine? '')) ifFalse:[
         super at:lineNr put:aLine.
         self textChanged
     ].
@@ -5020,11 +5023,13 @@
             self initializeCompletionSupport.
         ].
     ].
+    
     "/ JV: why setting it to nil here?
 "/    ifFalse:[
 "/        completionService := nil
 "/    ].
     completionSupport notNil ifTrue:[
+        completionSupport stopCompletionProcess.
         (completionSupport handleKeyPress:key x:x y:y) ifTrue:["eaten" ^ self].
     ].
 
@@ -5097,7 +5102,9 @@
 "/          ].
         ].
         true "immediateCompletion" ifTrue:[ 
-            completionSupport notNil ifTrue:[ completionSupport postKeyPress:key].
+            completionSupport notNil ifTrue:[ 
+                completionSupport postKeyPress:key
+            ].
         ].
         ^ self
     ].
--- a/ListView.st	Thu Jul 30 06:49:25 2015 +0200
+++ b/ListView.st	Sun Aug 09 07:20:03 2015 +0100
@@ -1517,7 +1517,7 @@
     ].
     
     sz := endLine - startLine + 1.
-    sz < 1 ifTrue:[^ nil].
+    sz < 1 ifTrue:[^ ''].
 
     text := StringCollection new:sz.
 
--- a/TextView.st	Thu Jul 30 06:49:25 2015 +0200
+++ b/TextView.st	Sun Aug 09 07:20:03 2015 +0100
@@ -1,3 +1,5 @@
+"{ Encoding: utf8 }"
+
 "
  COPYRIGHT (c) 1989 by Claus Gittinger
 	      All Rights Reserved
@@ -4824,7 +4826,7 @@
 
     selectionStartLine isNil ifTrue:[^ nil].
     sel := self textFromLine:selectionStartLine col:(selectionStartCol max:1) toLine:selectionEndLine col:selectionEndCol.
-    sel notNil ifTrue:[
+    sel notEmptyOrNil ifTrue:[
 	(gc characterEncoding ? #'iso10646-1' "eg unicode") ~~ #'iso10646-1' ifTrue:[
 	    sel := sel encodeFrom:gc characterEncoding into:#'iso10646-1'
         ].