--- a/AbstractSettingsApplication.st	Thu May 11 20:23:37 2006 +0200
+++ b/AbstractSettingsApplication.st	Thu May 11 20:27:47 2006 +0200
@@ -2255,7 +2255,7 @@
                        (CheckBoxSpec
                           label: 'Cursor has ST80 Line-end Behavior'
                           name: 'CursorST80LineEndBehaviorCheckBox'
-                          model: st80EditingMode
+                          model: st80EditMode
                           translateLabel: true
                           extent: (Point 600 23)
                         )
@@ -2282,10 +2282,10 @@
             #( 
                 searchDialogIsModal
                 startTextDragWithControl
+                st80EditMode
             )
         from:currentUserPrefs.
 
-    self st80EditingMode value:currentUserPrefs st80EditMode.
     self st80DoubleClickSelectMode value:TextView st80SelectMode.
     self tabsIs4 value:(ListView userDefaultTabPositions = ListView tab4Positions).
 !
@@ -2296,10 +2296,10 @@
             #( 
                 searchDialogIsModal
                 startTextDragWithControl
+                st80EditMode
             )
         to:currentUserPrefs.
 
-    currentUserPrefs st80EditMode:(self st80EditingMode value).
     TextView st80SelectMode:(self st80DoubleClickSelectMode value).
     tabsIs4 value ~~ (ListView userDefaultTabPositions = ListView tab4Positions) ifTrue:[
         ListView userDefaultTabPositions:(self tabsIs4 value ifTrue:[ListView tab4Positions] ifFalse:[ListView tab8Positions]).
@@ -2333,7 +2333,7 @@
     ^ st80DoubleClickSelectMode.
 !
 
-st80EditingMode
+st80EditMode
 
     st80EditingMode isNil ifTrue:[
         st80EditingMode := true asValue.
@@ -2363,15 +2363,22 @@
 !AbstractSettingsApplication::EditSettingsAppl methodsFor:'queries'!
 
 hasUnsavedChanges
-    currentUserPrefs st80EditMode ~= (self st80EditingMode value) ifTrue:[^ true].
     TextView st80SelectMode ~= (self st80DoubleClickSelectMode value) ifTrue:[^ true].
     tabsIs4 value ~~ (ListView userDefaultTabPositions = ListView tab4Positions) ifTrue:[
         ListView userDefaultTabPositions ~= (self tabsIs4 value 
                                                 ifTrue:[ListView tab4Positions] 
                                                 ifFalse:[ListView tab8Positions]) ifTrue:[^ true].
     ].
-    currentUserPrefs searchDialogIsModal ~= self searchDialogIsModal value ifTrue:[^ true].
-    currentUserPrefs startTextDragWithControl ~= self startTextDragWithControl value ifTrue:[^ true].
+
+    (self
+        hasChangedAspectIn:
+            #(
+                searchDialogIsModal
+                startTextDragWithControl
+                st80EditMode
+            )
+        asComparedTo:currentUserPrefs) ifTrue:[^ true].
+
     ^ false
 ! !
 
@@ -12134,5 +12141,5 @@
 !AbstractSettingsApplication class methodsFor:'documentation'!
 
 version
-    ^ '$Header: /cvs/stx/stx/libtool/AbstractSettingsApplication.st,v 1.227 2006-05-11 18:23:37 cg Exp $'
-! !
+    ^ '$Header: /cvs/stx/stx/libtool/AbstractSettingsApplication.st,v 1.228 2006-05-11 18:27:47 cg Exp $'
+! !