--- a/Tools_SearchDialog.st	Tue May 13 15:17:32 2008 +0200
+++ b/Tools_SearchDialog.st	Tue May 13 15:17:35 2008 +0200
@@ -22,8 +22,8 @@
 		allowBuffer allowBrowser isSelector searchClassProtocolHolder
 		searchInstanceProtocolHolder selectorOrCode'
 	classVariableNames:'LastCodeSearched LastCodeSearchWasMethod LastGlobalSearched
-		LastSearchWasMatch LastSearchWasIgnoringCase LastStringSearchArea
-		LastCodeSearchArea'
+		LastStringSearched LastSearchWasMatch LastSearchWasIgnoringCase
+		LastStringSearchArea LastCodeSearchArea'
 	poolDictionaries:''
 	category:'Interface-Browsers-New'
 !
@@ -165,6 +165,7 @@
                 LastGlobalSearched := sel.
             ] ifFalse:[
                 isSelector == #string ifTrue:[
+                    LastStringSearched := sel.
                     LastStringSearchArea := where.
                 ] ifFalse:[
                     (sel startsWith:'#''') ifTrue:[
@@ -730,20 +731,24 @@
     |sel inputField lastSearchPatterns|
 
     isSelector == true ifTrue:[ 
-	sel := browser selectorToSearchFor.
+        sel := browser selectorToSearchFor.
     ] ifFalse:[ 
-	isSelector == #globalName ifTrue:[ 
-	    sel := browser globalNameToSearchFor ? LastGlobalSearched.
-	] ifFalse:[ 
-	    sel := browser stringToSearchFor.
-	].
+        isSelector == #globalName ifTrue:[ 
+            sel := browser globalNameToSearchFor ? LastGlobalSearched.
+        ] ifFalse:[ 
+            isSelector == #string ifTrue:[
+                sel := browser stringToSearchFor ? LastStringSearched.
+            ] ifFalse:[
+                sel := browser selectorToSearchFor.
+            ]
+        ].
     ].
-    sel size == 0 ifTrue:[ 
-	"/ use last searchString
-	lastSearchPatterns := browser lastSearchPatterns.
-	lastSearchPatterns size > 0 ifTrue:[ 
-	    sel := lastSearchPatterns first.
-	].
+    sel isEmptyOrNil ifTrue:[ 
+        "/ use last searchString
+        lastSearchPatterns := browser lastSearchPatterns.
+        lastSearchPatterns size > 0 ifTrue:[ 
+            sel := lastSearchPatterns first.
+        ].
     ].
     selectorHolder := sel asValue.
 
@@ -751,23 +756,23 @@
     inputField list:lastSearchPatterns .
     inputField selectAll.
     inputField 
-	entryCompletionBlock:[ :contents | 
-	    |s what|
+        entryCompletionBlock:[ :contents | 
+            |s what|
 
-	    s := contents withoutSpaces.
-	    self topView 
-		withWaitCursorDo:[ 
-		    isSelector == #globalName ifFalse:[ 
-			what := Smalltalk selectorCompletion:s.
-		    ] ifTrue:[ 
-			what := Smalltalk globalNameCompletion:s.
-		    ].
-		    inputField contents:what first.
-		    (what at:2) size ~~ 1 ifTrue:[ 
-			browser window beep.
-		    ].
-		].
-	].
+            s := contents withoutSpaces.
+            self topView 
+                withWaitCursorDo:[ 
+                    isSelector == #globalName ifFalse:[ 
+                        what := Smalltalk selectorCompletion:s.
+                    ] ifTrue:[ 
+                        what := Smalltalk globalNameCompletion:s.
+                    ].
+                    inputField contents:what first.
+                    (what at:2) size ~~ 1 ifTrue:[ 
+                        browser window beep.
+                    ].
+                ].
+        ].
 !
 
 addTextEntryFieldForCode
@@ -1084,5 +1089,5 @@
 !SearchDialog class methodsFor:'documentation'!
 
 version
-    ^ '$Header: /cvs/stx/stx/libtool/Tools_SearchDialog.st,v 1.25 2008-04-25 13:24:49 cg Exp $'
+    ^ '$Header: /cvs/stx/stx/libtool/Tools_SearchDialog.st,v 1.26 2008-05-13 13:17:35 cg Exp $'
 ! !