BrowserView.st
changeset 971 3f31069f85ce
parent 969 dbe3bcdcbd47
child 978 007c5b8c75b5
--- a/BrowserView.st	Fri Jan 17 23:28:18 1997 +0100
+++ b/BrowserView.st	Sat Jan 18 16:26:25 1997 +0100
@@ -7962,7 +7962,7 @@
      its not ok, if code has been changed.
      in this case, return the result of a user query"
 
-    |what m src1 src2 v|
+    |what m src1 src2 list1 list2 v|
 
     codeView modified ifFalse:[
         ^ true
@@ -7973,10 +7973,26 @@
             m := actualClass compiledMethodAt:currentSelector.
             m notNil ifTrue:[
                 (src1 := m source) = (src2 := codeView contents) ifFalse:[
-                    (src1 asCollectionOfLines collect:[:line | line withoutTrailingSeparators])
-                    =
-                    (src2 asCollectionOfLines collect:[:line | line withoutTrailingSeparators])
-                    ifFalse:[
+                    list1 := src1 asCollectionOfLines collect:[:line | line isNil ifTrue:['']
+                                                               ifFalse:[
+                                                                    line 
+                                                                        withoutTrailingSeparators
+                                                                            withTabsExpanded
+                                                               ]
+                                                      ].
+                    list2 := src2 asCollectionOfLines collect:[:line | line isNil ifTrue:['']
+                                                               ifFalse:[
+                                                                    line 
+                                                                        withoutTrailingSeparators
+                                                                            withTabsExpanded
+                                                               ]
+                                                      ].
+                    HistoryManager notNil ifTrue:[
+                        list1 := HistoryManager withoutHistoryLines:list1 asStringCollection asString.
+                        list2 := HistoryManager withoutHistoryLines:list2 asStringCollection asString.
+                    ].
+
+                    list1 = list2 ifFalse:[
                         what := self checkSelectionChangeAllowedWithCompare:true.
                         what == #compare ifTrue:[
                             v := DiffTextView 
@@ -7998,7 +8014,7 @@
     ^ self checkSelectionChangeAllowedWithCompare:false
 
     "Created: 24.11.1995 / 11:03:33 / cg"
-    "Modified: 10.11.1996 / 18:14:31 / cg"
+    "Modified: 18.1.1997 / 14:46:39 / cg"
 !
 
 checkSelectionChangeAllowedWithCompare:compareOffered
@@ -9474,6 +9490,6 @@
 !BrowserView class methodsFor:'documentation'!
 
 version
-    ^ '$Header: /cvs/stx/stx/libtool/BrowserView.st,v 1.258 1997-01-17 19:45:58 cg Exp $'
+    ^ '$Header: /cvs/stx/stx/libtool/BrowserView.st,v 1.259 1997-01-18 15:26:25 cg Exp $'
 ! !
 BrowserView initialize!